Merge pull request #173 from resibots/cmake_multiple_inclusion

cmake.in multiple inclusion
NOSALRO · Mar 15, 2022 · 588db92 · 588db92
2 parents efa8c7d + f6bedf4
commit 588db92
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/cmake/RobotDARTConfig.cmake.in b/cmake/RobotDARTConfig.cmake.in
@@ -4,6 +4,8 @@
 # add_executable(robot_dart_example example.cpp)
 # target_link_libraries(robot_dart_example RobotDART::Simu)
 
+include_guard(DIRECTORY)
+
 include(CMakeFindDependencyMacro)
 include(FindPackageHandleStandardArgs)
 
@@ -83,4 +85,4 @@ find_package_handle_standard_args(
     RobotDART_INCLUDE_DIRS
     RobotDART_LIBRARY_DIRS)
 
-mark_as_advanced(RobotDART_INCLUDE_DIRS RobotDART_LIBRARY_DIRS RobotDART_LIBRARY RobotDART_FOUND)
+mark_as_advanced(RobotDART_INCLUDE_DIRS RobotDART_LIBRARY_DIRS RobotDART_LIBRARY RobotDART_FOUND)
diff --git a/cmake/UthequeConfig.cmake.in b/cmake/UthequeConfig.cmake.in
@@ -4,6 +4,8 @@
 # add_executable(your_example example.cpp)
 # target_link_libraries(your_example Utheque)
 
+include_guard(DIRECTORY)
+
 include(CMakeFindDependencyMacro)
 include(FindPackageHandleStandardArgs)
 

diff --git a/wscript b/wscript
@@ -402,7 +402,7 @@ def build_examples(bld):
     print("Bulding examples...")
     libs = 'BOOST EIGEN DART PTHREAD'
     path = bld.path.abspath() + '/res'
-    bld.env.LIB_PTHREAD = ['pthread']
+    bld.env.LIB_PTHREAD = ['pthread', 'tbb']
 
     # these examples should not be compiled without magnum
     magnum_only = ['magnum_contexts.cpp', 'cameras.cpp', 'transparent.cpp']
@@ -417,6 +417,9 @@ def build_examples(bld):
             ffile = os.path.join(root, filename)
             basename = filename.replace('.cpp', '')
             # plain version
+            cxxflags = ''
+            if basename == 'mpc':
+                cxxflags = '-ltbb'
             if (filename not in exclude) and (filename not in magnum_only):
                 bld.program(features = 'cxx',
                     install_path = None,