Changeset 365 in flair-src for trunk

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

Files:

• cmake-modules/FlairUseFile.cmake (modified) (1 diff)
• cmake-modules/GlobalCmakeFlair.cmake (modified) (1 diff)
• demos/CircleFollower/simulator/CMakeLists.txt (modified) (1 diff)
• demos/Gps/simulator/CMakeLists.txt (modified) (1 diff)
• demos/MixedReality/real/simulator/CMakeLists.txt (modified) (1 diff)
• demos/MixedReality/virtual/simulator/CMakeLists.txt (modified) (1 diff)
• demos/OpticalFlow/simulator/CMakeLists.txt (modified) (1 diff)
• demos/PidStandalone/simulator/CMakeLists.txt (modified) (1 diff)
• demos/SimpleFleet/simulator/CMakeLists.txt (modified) (1 diff)
• lib/FlairSimulator/src/Gui_impl.cpp (modified) (1 diff)
• scripts/distribution_specific_hack.sh (modified) (2 diffs)
• tools/FlairGCS/CMakeLists.txt (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()

trunk/demos/CircleFollower/simulator/CMakeLists.txt

@@ -11 +11 @@
 )
 
-FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
            DEST_DIR CircleFollower
            COPY_RESOURCES

trunk/demos/Gps/simulator/CMakeLists.txt

@@ -11 +11 @@
 )
 
-FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
            DEST_DIR Gps
            COPY_RESOURCES

trunk/demos/MixedReality/real/simulator/CMakeLists.txt

@@ -13 +13 @@
 )
 
-FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
            DEST_DIR MixedReality_real
            COPY_RESOURCES

trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt

@@ -14 +14 @@
 )
 
-FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
            DEST_DIR MixedReality_virtual
            COPY_RESOURCES

trunk/demos/OpticalFlow/simulator/CMakeLists.txt

@@ -11 +11 @@
 )
 
-FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
            DEST_DIR OpticalFlow
            COPY_RESOURCES

trunk/demos/PidStandalone/simulator/CMakeLists.txt

@@ -11 +11 @@
 )
 
-FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
            DEST_DIR PidStandalone
            COPY_RESOURCES

trunk/demos/SimpleFleet/simulator/CMakeLists.txt

@@ -11 +11 @@
 )
 
-FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+FLAIR_DEMO_HOST_CXX(${PROJECT_NAME} "${SRC_FILES}"
            DEST_DIR SimpleFleet
            COPY_RESOURCES

trunk/lib/FlairSimulator/src/Gui_impl.cpp

@@ -85 +85 @@
   this->scene_height = scene_height;
 
-  device = createDevice(driver_type, dimension2d<u32>(app_width, app_height),
-                        16, false, false, false);
+  device = createDevice(driver_type, dimension2d<u32>(app_width, app_height),16, false, false, false);
+  if(device==NULL) self->Err("Irrlicht failed to create video device\n");
   receiver = new MyEventReceiver();
   device->setEventReceiver(receiver);

trunk/scripts/distribution_specific_hack.sh

@@ -26 +26 @@
 fi
 
-if [ _$DISTRIB_ID = _Ubuntu ]; then
+#also needed in mint, but for different reason?
+#if not in sudo in mint, simlator does not work cause of:
+#libGL: MESA-LOADER: failed to open /usr/lib/x86_64-linux-gnu/dri/iris_dri.so: /usr/lib/x86_64-linux-gnu/dri/iris_dri.so: failed to map segment from shared object
+
+#if [ _$DISTRIB_ID = _Ubuntu ]; then
   #tested on Ubuntu 17.10
   #we must run as root
@@ -38 +42 @@
   fi
 
-fi
+#fi
 
 #special actions if we use 3D

trunk/tools/FlairGCS/CMakeLists.txt

@@ -74 +74 @@
 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)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${QT_LIBRARIES} qwt QwtDataViewer udt QtLocation FileLib z)