Changeset 102 in flair-dev for trunk

Timestamp:

02/07/19 16:27:03 (5 years ago)

Author:

Sanahuja Guillaume

Message:

modifs for demos resources

Location:

trunk/cmake-modules

Files:

• ArchDir.cmake (modified) (1 diff)
• GlobalCmakeFlair.cmake (modified) (1 diff)

trunk/cmake-modules/ArchDir.cmake

@@ -3 +3 @@
 endif()
 
-if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
-    SET(ARCH_DIR "x86_64/unix")
-elseif(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
+if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
     SET(ARCH_DIR ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE})
 else()

trunk/cmake-modules/GlobalCmakeFlair.cmake

@@ -127 +127 @@
     endif()
 endfunction()
+
+#copy resources (ex: demos scripts and xml)
+function(INSTALL)
+    if(COPY_RESOURCE_FILES)
+        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-bin/demos/${ARCH_DIR}/${PROJECT_NAME}/${filename}\")
+                    file(INSTALL \"${item}\" DESTINATION \"$ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}\")
+                endif()
+            ")
+        endforeach()
+
+    endif()
+    #call original function
+        _INSTALL(${ARGV})
+endfunction()