Changeset 365 in flair-src for trunk/cmake-modules

Timestamp:

Oct 5, 2020, 9:32:31 AM (4 years ago)

Author:

Sanahuja Guillaume

Message:

change simu apps compilation to avoid problem with mixing host and toolchain libs
(log2@glibc_2.29 error when compiling on ubuntu 20.05 or mint 20)
now compile with host g++ and libs (except filelib, irrlicht, quat, udt and vrpn) for simu apps using the macro: FLAIR_DEMO_HOST_CXX

Location:

trunk/cmake-modules

Files:

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

trunk/cmake-modules/FlairUseFile.cmake

@@ -102 +102 @@
         IF (FLAIR_USE_SIMULATOR_GL)
                 ADD_DEFINITIONS("-DGL")
-                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a GL ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
+                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a GL ${FLAIR_LIBRARIES} Irrlicht)
         else()
                 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${FLAIR_LIBRARIES})

trunk/cmake-modules/GlobalCmakeFlair.cmake

@@ -151 +151 @@
         endforeach()
     endif()
+
+endfunction()
+
+#create a demo using host cxx and libs
+#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()
+                ")
+              
+        endforeach()
+    endforeach()
+
+    FLAIR_DEMO(${ARGV})
 
 endfunction()