Conditionally link libdl to libpdalutil for dladdr.

cmake/macros.cmake

@@ -53,7 +53,6 @@ endmacro(PDAL_ADD_INCLUDES)
 ###############################################################################
 # Add a library target.
 # _name The library name.
-# _component The part of PDAL that this library belongs to.
 # ARGN The source files for the library.
 #
 # The "generate_dimension_hpp" ensures that Dimension.hpp is built before
@@ -71,6 +70,22 @@ macro(PDAL_ADD_LIBRARY _name)
         ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR})
 endmacro(PDAL_ADD_LIBRARY)
 
+###############################################################################
+# Add a free library target (one that doesn't depend on PDAL).
+# _name The library name.
+# ARGN The source files for the library.
+#
+macro(PDAL_ADD_FREE_LIBRARY _name)
+    add_library(${_name} ${PDAL_LIB_TYPE} ${ARGN})
+    set_property(TARGET ${_name} PROPERTY FOLDER "Libraries")
+
+    install(TARGETS ${_name}
+        EXPORT PDALTargets
+        RUNTIME DESTINATION ${PDAL_BIN_INSTALL_DIR}
+        LIBRARY DESTINATION ${PDAL_LIB_INSTALL_DIR}
+        ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR})
+endmacro(PDAL_ADD_FREE_LIBRARY)
+
 ###############################################################################
 # Add an executable target.
 # _name The executable name.

dimbuilder/CMakeLists.txt

@@ -15,22 +15,13 @@ include(${ROOT_DIR}/cmake/common.cmake NO_POLICY_SCOPE)
 
 include_directories(${PDAL_JSONCPP_INCLUDE_DIR})
 
-
 set (SOURCES
     DimBuilder.cpp
     ${PDAL_JSONCPP_SRC}
-    ${PDAL_UTIL_DIR}/Utils.cpp
-)
-
-set (HEADERS
-    DimBuilder.hpp
-    ${PDAL_INCLUDE_DIR}/pdal/util/Utils.hpp
 )
 
-add_executable(dimbuilder ${SOURCES} ${HEADERS})
+add_executable(dimbuilder ${SOURCES})
+target_link_libraries(dimbuilder PRIVATE ${PDAL_UTIL_LIB_NAME})
 if (PDAL_HAVE_JSONCPP)
     target_link_libraries(dimbuilder ${PDAL_JSONCPP_LIB_NAME})
 endif()
-if (UNIX AND NOT APPLE)
-    target_link_libraries(dimbuilder PUBLIC dl)
-endif()

src/CMakeLists.txt

@@ -207,10 +207,6 @@ if (WIN32)
     target_link_libraries(${PDAL_BASE_LIB_NAME} PUBLIC ws2_32)
 endif()
 
-if (UNIX)
-    target_link_libraries(${PDAL_BASE_LIB_NAME} PUBLIC dl)
-endif()
-
 ###############################################################################
 # Targets installation
 

src/util/CMakeLists.txt

@@ -32,12 +32,19 @@ set(PDAL_UTIL_SOURCES
     ${PDAL_UTIL_CPP}
     ${PDAL_UTIL_HPP})
 
-PDAL_ADD_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES})
+PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES})
 target_link_libraries(${PDAL_UTIL_LIB_NAME}
     PRIVATE
         ${PDAL_BOOST_LIB_NAME}
 )
 
+if (UNIX AND NOT APPLE)
+    target_link_libraries(${PDAL_UTIL_LIB_NAME}
+        PRIVATE
+            dl
+    )
+endif()
+
 set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES
     VERSION "${PDAL_BUILD_VERSION}"
     SOVERSION "${PDAL_API_VERSION}"

vendor/arbiter/CMakeLists.txt

@@ -21,7 +21,7 @@ if(UNIX)
 endif()
 
 
-PDAL_ADD_LIBRARY(${PDAL_ARBITER_LIB_NAME} STATIC "${PDAL_ARBITER_SOURCES}")
+PDAL_ADD_FREE_LIBRARY(${PDAL_ARBITER_LIB_NAME} STATIC "${PDAL_ARBITER_SOURCES}")
 target_link_libraries(${PDAL_ARBITER_LIB_NAME} )
 
 set_target_properties(${PDAL_ARBITER_LIB_NAME} PROPERTIES

vendor/jsoncpp/dist/CMakeLists.txt

@@ -10,7 +10,7 @@ file(GLOB PDAL_JSONCPP_SOURCES
     "jsoncpp.cpp"
 )
 
-PDAL_ADD_LIBRARY(${PDAL_JSONCPP_LIB_NAME} STATIC "${PDAL_JSONCPP_SOURCES}")
+PDAL_ADD_FREE_LIBRARY(${PDAL_JSONCPP_LIB_NAME} STATIC "${PDAL_JSONCPP_SOURCES}")
 
 if (UNIX)
     target_compile_options(${PDAL_JSONCPP_LIB_NAME} PRIVATE -fPIC)

vendor/pdalboost/CMakeLists.txt

@@ -25,7 +25,7 @@ endif()
 
 add_definitions(-DBOOST_SYSTEM_NO_DEPRECATED)
 
-PDAL_ADD_LIBRARY(${PDAL_BOOST_LIB_NAME} STATIC "${PDAL_BOOST_SOURCES}")
+PDAL_ADD_FREE_LIBRARY(${PDAL_BOOST_LIB_NAME} STATIC "${PDAL_BOOST_SOURCES}")
 
 set_target_properties(${PDAL_BOOST_LIB_NAME} PROPERTIES
     VERSION "${PDAL_BUILD_VERSION}"