Merge pull request #692 from PDAL/make-install

Get installer working with new directory structure.

CMakeLists.txt

@@ -49,6 +49,7 @@ SET(PDAL_C_LIB_SOVERSION ${PDAL_VERSION_MAJOR})
 
 # Name of C++ library
 set(PDAL_LIB_NAME pdalcpp)
+set(PDAL_UTIL_LIB_NAME pdal_util)
 
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 

src/CMakeLists.txt

@@ -234,13 +234,13 @@ if (PDAL_HAVE_LIBXML2)
     target_link_libraries(${PDAL_LIB_NAME} ${LIBXML2_LIBRARIES})
 endif()
 
-target_link_libraries(${PDAL_LIB_NAME} 
+target_link_libraries(${PDAL_LIB_NAME}
     ${CMAKE_THREAD_LIBS_INIT}
     ${GEOTIFF_LIBRARY}
     ${GDAL_LIBRARY}
     ${GEOS_LIBRARY}
     ${ZLIB_LIBRARIES}
-    PdalUtil
+    ${PDAL_UTIL_LIB_NAME}
 )
 
 target_link_libraries(${PDAL_LIB_NAME} ${Boost_LIBRARIES})

tools/lasdump/CMakeLists.txt

@@ -12,7 +12,6 @@ if(NOT ROOT_DIR)
 endif()
 include(${ROOT_DIR}/cmake/common.cmake NO_POLICY_SCOPE)
 
-add_subdirectory(${PDAL_UTIL_DIR} "${CMAKE_CURRENT_BINARY_DIR}/util")
 include_directories(${PDAL_UTIL_DIR} ${PDAL_INCLUDE_DIR})
 
 #
@@ -39,7 +38,7 @@ if (LASZIP_FOUND)
 
     add_executable(lasdump ${SOURCES} ${HEADERS})
     target_link_libraries(lasdump
-        PdalUtil
+        ${PDAL_UTIL_LIB_NAME}
         ${LASZIP_LIBRARIES}
     )
 endif()

util/CMakeLists.txt

@@ -6,6 +6,21 @@ if(EXISTS)
     return()
 endif()
 
-add_library(PdalUtil SHARED Bounds.cpp Bounds.hpp)
+set(PDAL_UTIL_HPP
+    "${PDAL_UTIL_DIR}/Bounds.hpp")
+
+set(PDAL_UTIL_CPP
+    "${PDAL_UTIL_DIR}/Bounds.cpp")
+
+set(PDAL_UTIL_SOURCES
+    ${PDAL_UTIL_CPP}
+    ${PDAL_UTIL_HPP})
+
+PDAL_ADD_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES})
+
+install(DIRECTORY "${PDAL_UTIL_DIR}/"
+  DESTINATION "${PDAL_INCLUDE_INSTALL_DIR}"
+  FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
 
 set_property(GLOBAL PROPERTY _UTIL_INCLUDED TRUE)
+