Some fixes for linking against lvr2::lvr2 target

JustusBraun · Nov 8, 2024 · 52eedd0 · 52eedd0
1 parent 946db41
commit 52eedd0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,8 +9,8 @@ option(BUILD_TOOLS_EXPERIMENTAL "Build experimental tools" OFF)
 option(WITH_DRACO "Build libraries with draco enabled" OFF)
 
 ## Compile as C++17
-add_compile_options(-std=c++17)
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # DEFAULT RELEASE
 if (NOT EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
@@ -583,6 +583,7 @@ endif()
 ###############################################################################
 
 set(LVR2_LIB_DEPENDENCIES
+    ${Boost_LIBRARIES}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}

diff --git a/LVR2Config.cmake.in b/LVR2Config.cmake.in
@@ -71,7 +71,7 @@ if(@CGAL_FOUND@)
   list(APPEND LVR2_INCLUDE_DIRS ${CGAL_INCLUDE_DIRS})
 endif()
 
-find_package(Boost REQUIRED)
+find_package(Boost COMPONENTS @Boost_COMPONENTS@ REQUIRED)
 list(APPEND LVR2_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
 list(APPEND LVR2_DEFINITIONS ${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
 

diff --git a/src/liblvr2/CMakeLists.txt b/src/liblvr2/CMakeLists.txt
@@ -165,6 +165,11 @@ target_link_libraries(
   lvr2_static 
   ${LVR2_INTERNAL_DEPENDENCIES_STATIC} 
   ${LVR2_LIB_DEPENDENCIES})
+target_compile_definitions(
+    lvr2_static
+    PUBLIC
+    ${LVR2_DEFINITIONS}
+)
 
 
 #####################################################################################
@@ -178,6 +183,11 @@ if( NOT MSVC )
     lvr2 
     ${LVR2_INTERNAL_DEPENDENCIES_SHARED} 
     ${LVR2_LIB_DEPENDENCIES})
+target_compile_definitions(
+    lvr2
+    PUBLIC
+    ${LVR2_DEFINITIONS}
+)
 
 install(TARGETS lvr2_static lvr2
   EXPORT lvr2Targets