Changeset 305 in flair-src for trunk

Timestamp:

Feb 28, 2019, 3:42:07 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

gcs resources

Location:

trunk

Files:

• cmake-modules/GlobalCmakeFlair.cmake (modified) (2 diffs)
• tools/FlairGCS/CMakeLists.txt (modified) (2 diffs)
• tools/FlairGCS/resources (added)
• tools/FlairGCS/resources/core2-64 (added)
• tools/FlairGCS/resources/core2-64/launch_flairgcs.sh (added)

trunk/cmake-modules/GlobalCmakeFlair.cmake

@@ -155 +155 @@
 
 function(FLAIR_NRT_TOOL PROJECT_NAME SRC_FILES)
+    set(options COPY_RESOURCES)
+    set(oneValueArgs "")#not used
+    set(multiValueArgs "")#not used
+    cmake_parse_arguments(PARSE_ARGV 2 TOOL "${options}" "${oneValueArgs}" "${multiValueArgs}")
+
+    if(DEFINED TOOL_UNPARSED_ARGUMENTS)
+        warn("FLAIR_NRT_TOOL function: unparsed arguments (${TOOL_UNPARSED_ARGUMENTS})")
+    endif()
+
     #get ${FLAIR_INCLUDE_DIR}, ${FLAIR_LIBRARIES_RT} and ${FLAIR_LIBRARIES_NRT}
     include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/FlairUseFile.cmake)
@@ -173 +182 @@
         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR}/
     )
+
+    #copy resources if needed
+    if(${TOOL_COPY_RESOURCES})
+        FILE(GLOB RESOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/resources/${ARCH_DIR}/*")
+        foreach(item IN LISTS RESOURCE_FILES)
+            get_filename_component(filename ${item} NAME)
+            #do not overwrite: user can change xml or scripts 
+            INSTALL(CODE "
+                if (NOT EXISTS \"$ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR}/${filename}\")
+                    file(INSTALL \"${item}\" DESTINATION \"$ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR}\" USE_SOURCE_PERMISSIONS)
+                else()
+                    message(\"-- Not installing \" $ENV{FLAIR_ROOT} \"/flair-install/bin/tools/\" ${ARCH_DIR} \"/\" ${filename} \" (file already exists)\")
+                endif()
+            ")
+        endforeach()
+    endif()
+
 endfunction()
 

trunk/tools/FlairGCS/CMakeLists.txt

@@ -72 +72 @@
 )
 
-ADD_EXECUTABLE(${PROJECT_NAME} ${PROJECT_SOURCE_FILES} ${MOC_SOURCES} ${RCC_SOURCES})
+SET(SRC_FILES ${PROJECT_SOURCE_FILES} ${MOC_SOURCES} ${RCC_SOURCES})
+FLAIR_NRT_TOOL(${PROJECT_NAME} "${SRC_FILES}" COPY_RESOURCES)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES} GL qwt QwtDataViewer udt QtLocation FileLib z)
 
-INSTALL(
-        TARGETS ${PROJECT_NAME}
-        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR}
-)
 
 add_custom_target(
@@ -87 +84 @@
 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
 else()
 warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")