Changeset 297 in flair-src for trunk/lib

Timestamp:

Jan 28, 2019, 5:22:21 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

going to out of source build

Location:

trunk/lib

Files:

• CMakeLists.txt (added)
• FlairCore/CMakeLists.txt (modified) (2 diffs)
• FlairFilter/CMakeLists.txt (modified) (1 diff)
• FlairMeta/CMakeLists.txt (modified) (1 diff)
• FlairSensorActuator/CMakeLists.txt (modified) (2 diffs)
• FlairSimulator/CMakeLists.txt (modified) (1 diff)
• FlairVisionFilter/CMakeLists.txt (modified) (2 diffs)

trunk/lib/FlairCore/CMakeLists.txt

@@ -28 +28 @@
 )
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt)
 if(NOT WIN32)
@@ -36 +34 @@
 
 add_custom_target(
-        compile_info
+        ${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 compile_info)
-add_dependencies(FlairCore_nrt compile_info)
+add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info)
+add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info)

trunk/lib/FlairFilter/CMakeLists.txt

@@ -43 +43 @@
 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_custom_target(
-        compile_info
+        ${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} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)

trunk/lib/FlairMeta/CMakeLists.txt

@@ -43 +43 @@
 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_custom_target(
-        compile_info
+        ${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} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)

trunk/lib/FlairSensorActuator/CMakeLists.txt

@@ -30 +30 @@
 FILE(GLOB SENSOR_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 ADD_LIBRARY(${PROJECT_NAME}
         ${SENSOR_SRC}
@@ -45 +43 @@
 
 add_custom_target(
-        compile_info
+        ${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} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)

trunk/lib/FlairSimulator/CMakeLists.txt

@@ -31 +31 @@
 FILE(GLOB SIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 add_custom_target(
-        compile_info
+        ${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_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl)
-add_dependencies(FlairSimulator_nogl compile_info)
+add_dependencies(FlairSimulator_nogl ${PROJECT_NAME}_compile_info)
 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl)
-add_dependencies(FlairSimulator_gl compile_info)
+add_dependencies(FlairSimulator_gl ${PROJECT_NAME}_compile_info)
 endif()

trunk/lib/FlairVisionFilter/CMakeLists.txt

@@ -31 +31 @@
 FILE(GLOB SRC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 ADD_LIBRARY(${PROJECT_NAME}
         ${SRC_SRC}
@@ -46 +44 @@
 
 add_custom_target(
-        compile_info
+        ${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} compile_info)
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
 
 else()