Merge pull request #1336 from rdiankov/fix_crlibm_cmake

rdiankov · Nov 25, 2023 · 25f350a · 25f350a
2 parents c21a301 + d0ca2e8
commit 25f350a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -16,7 +16,7 @@ else()
 endif()
 
 if( TARGET crlibm-native )
-  set(openrave_libraries ${openrave_libraries} ${CRLIBM_LIBRARY})
+  set(openrave_static_libraries ${openrave_static_libraries} crlibm)
   if( CRLIBM_INCLUDE_DIR )
     include_directories(${CRLIBM_INCLUDE_DIR})
   endif()

diff --git a/src/libopenrave/CMakeLists.txt b/src/libopenrave/CMakeLists.txt
@@ -66,7 +66,7 @@ set_target_properties(libopenrave PROPERTIES OUTPUT_NAME openrave${OPENRAVE_LIBR
                                   LINK_FLAGS "${LIBOPENRAVE_LINK_FLAGS} ${FPARSER_LINK_FLAGS}")
 target_compile_definitions(libopenrave PRIVATE "OPENRAVE_STATIC_PLUGINS=${OPENRAVE_STATIC_PLUGINS}")
 target_link_libraries(libopenrave
-  PRIVATE boost_assertion_failed static_plugins openrave-md5 crlibm ${openrave_static_libraries} openrave-msgpack
+  PRIVATE boost_assertion_failed static_plugins openrave-md5 ${openrave_static_libraries} openrave-msgpack
   PUBLIC LibXml2::LibXml2 Boost::filesystem Boost::thread ${CMAKE_DL_LIBS} ${openrave_libraries}
 )
 install(TARGETS libopenrave
@@ -112,7 +112,7 @@ if( OPT_STATIC )
     add_dependencies(libopenrave_static check_libm_accuracy-native) # forces check to be run before libopenrave is compilde
   endif()
   target_link_libraries(libopenrave_static
-    PRIVATE boost_assertion_failed static_plugins openrave-md5 crlibm ${openrave_static_libraries} openrave-msgpack
+    PRIVATE boost_assertion_failed static_plugins openrave-md5 ${openrave_static_libraries} openrave-msgpack
     PUBLIC LibXml2::LibXml2 Boost::filesystem Boost::thread ${openrave_libraries}
   )
   install(TARGETS libopenrave_static