Changeset 365 in flair-src for trunk/demos

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/demos

Files:

• CircleFollower/simulator/CMakeLists.txt (modified) (1 diff)
• Gps/simulator/CMakeLists.txt (modified) (1 diff)
• MixedReality/real/simulator/CMakeLists.txt (modified) (1 diff)
• MixedReality/virtual/simulator/CMakeLists.txt (modified) (1 diff)
• OpticalFlow/simulator/CMakeLists.txt (modified) (1 diff)
• PidStandalone/simulator/CMakeLists.txt (modified) (1 diff)
• SimpleFleet/simulator/CMakeLists.txt (modified) (1 diff)

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