Changeset 367 in flair-src for trunk

Timestamp:

Nov 9, 2020, 12:38:02 PM (4 years ago)

Author:

Sanahuja Guillaume

Message:

use host cxx only for x86 targets

File:

• trunk/cmake-modules/GlobalCmakeFlair.cmake (modified) (2 diffs)

trunk/cmake-modules/GlobalCmakeFlair.cmake

@@ -59 +59 @@
     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 -fPIE")
+                    ADD_DEFINITIONS("-std=c++11")
             else()
-                    ADD_DEFINITIONS("-std=c++0x -fPIE")
+                    ADD_DEFINITIONS("-std=c++0x")
             endif()
     else()
             message(STATUS "GCC version < 4.3, c+11 is not supported!")
+    endif()
+
+    if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")      
+        ADD_DEFINITIONS("-fPIE")
     endif()
 
@@ -157 +161 @@
 #usefull for simulator app when there are graphical lib incompatibilities (eg log2@glibc_2.29)
 function(FLAIR_DEMO_HOST_CXX PROJECT_NAME SRC_FILES)
-    
-    set(CMAKE_CXX_FLAGS "" PARENT_SCOPE)
-    set(CMAKE_CXX_COMPILER "g++" PARENT_SCOPE)
-    set(CMAKE_CXX_LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs -Wl,-rpath=/home/gsanahuj/flair/flair-install/lib/${ARCH_DIR}/ -Wl,--disable-new-dtags" PARENT_SCOPE)
-    ADD_DEFINITIONS("-D_GLIBCXX_USE_CXX11_ABI=0")
-
-    set(LIB_LIST libudt libvrpn libFileLib libIrrlicht libquat)
-
-    foreach(LIB_NAME IN LISTS LIB_LIST) #all libs
-        FILE(GLOB LIB_FILES "${CMAKE_SYSROOT}/usr/lib/${LIB_NAME}*")
-        foreach(item IN LISTS LIB_FILES) #all files and symlinks of a lib
-            get_filename_component(filename ${item} NAME)              
-            INSTALL(CODE "
-                    if (NOT EXISTS \"$ENV{FLAIR_ROOT}/flair-install/lib/${ARCH_DIR}/${filename}\")
-                        file(INSTALL \"${item}\" DESTINATION \"$ENV{FLAIR_ROOT}/flair-install/lib/${ARCH_DIR}\" USE_SOURCE_PERMISSIONS)
-                    else()
-                        message(\"-- Not installing \" $ENV{FLAIR_ROOT} \"/flair-install/lib/\" ${ARCH_DIR} \"/\" ${filename} \" (file already exists)\")
-                    endif()
-                ")
-              
+    if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
+
+        set(CMAKE_CXX_FLAGS "" PARENT_SCOPE)
+        set(CMAKE_CXX_COMPILER "g++" PARENT_SCOPE)
+        set(CMAKE_CXX_LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs -Wl,-rpath=/home/gsanahuj/flair/flair-install/lib/${ARCH_DIR}/ -Wl,--disable-new-dtags" PARENT_SCOPE)
+        ADD_DEFINITIONS("-D_GLIBCXX_USE_CXX11_ABI=0")
+
+        set(LIB_LIST libudt libvrpn libFileLib libIrrlicht libquat)
+
+        foreach(LIB_NAME IN LISTS LIB_LIST) #all libs
+            FILE(GLOB LIB_FILES "${CMAKE_SYSROOT}/usr/lib/${LIB_NAME}*")
+            foreach(item IN LISTS LIB_FILES) #all files and symlinks of a lib
+                get_filename_component(filename ${item} NAME)              
+                INSTALL(CODE "
+                        if (NOT EXISTS \"$ENV{FLAIR_ROOT}/flair-install/lib/${ARCH_DIR}/${filename}\")
+                            file(INSTALL \"${item}\" DESTINATION \"$ENV{FLAIR_ROOT}/flair-install/lib/${ARCH_DIR}\" USE_SOURCE_PERMISSIONS)
+                        else()
+                            message(\"-- Not installing \" $ENV{FLAIR_ROOT} \"/flair-install/lib/\" ${ARCH_DIR} \"/\" ${filename} \" (file already exists)\")
+                        endif()
+                    ")
+                  
+            endforeach()
         endforeach()
-    endforeach()
-
-    FLAIR_DEMO(${ARGV})
+
+        FLAIR_DEMO(${ARGV})
+    else()
+        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+    endif()
 
 endfunction()