Changeset 302 in flair-src for trunk/tools/FlairGCS

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modifs nouveau build system

File:

• trunk/tools/FlairGCS/CMakeLists.txt (modified) (3 diffs)

trunk/tools/FlairGCS/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(flairgcs)
 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)
 
 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
@@ -65 +65 @@
         ${CMAKE_SYSROOT}/usr/include/qt4/QtMobility
         ${CMAKE_SYSROOT}/usr/include/qt4/QtLocation
+    ${CMAKE_BINARY_DIR}/generated/
 )
 
@@ -76 +77 @@
 INSTALL(
         TARGETS ${PROJECT_NAME}
-        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR}
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR}
 )
 
 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
+        COMMAND $ENV{FLAIR_ROOT}/flair-src/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/generated/compile_info.h
 )