Changeset 302 in flair-src for trunk/lib/FlairMeta

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modifs nouveau build system

File:

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

trunk/lib/FlairMeta/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(FlairMeta)
 cmake_minimum_required(VERSION 2.8)
-include($ENV{FLAIR_ROOT}/flair-dev/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()
+include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
 
 INCLUDE_DIRECTORIES(
-        ${LIBXML2_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
         ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src
@@ -30 +14 @@
 FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
-ADD_LIBRARY(${PROJECT_NAME}
-        ${SRC_FILES}
+FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}"
+        INCLUDES_DEST_DIR ${PROJECT_NAME}
 )
-
-INSTALL(TARGETS ${PROJECT_NAME}
-        LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
-        ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}
-)
-
-#copie des entetes
-FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
-INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
-
-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(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)