Changeset 302 in flair-src for trunk/lib/FlairCore/CMakeLists.txt

Timestamp:

Feb 25, 2019, 4:28:34 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

modifs nouveau build system

File:

• trunk/lib/FlairCore/CMakeLists.txt (modified) (2 diffs)

trunk/lib/FlairCore/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(FlairCore)
 cmake_minimum_required(VERSION 2.8)
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
 
 find_package(LibXml2 REQUIRED)
-
-execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                OUTPUT_VARIABLE GCC_VERSION)
-
-if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
-        if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
-                ADD_DEFINITIONS("-std=c++11")
-        else()
-                ADD_DEFINITIONS("-std=c++0x")
-        endif()
-else()
-        message(STATUS "GCC version < 4.3, c+11 is not supported!")
-endif()
 
 FILE(GLOB FLAIRCORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
@@ -29 +16 @@
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt)
-if(NOT WIN32)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rt)
-endif()
-
-add_custom_target(
-        ${PROJECT_NAME}_compile_info
-        COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h
-)
-
-add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info)
-add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info)