Merge branch 'alpha-dev' into multiple-asset-dirs

CMakeLists.txt

@@ -58,11 +58,8 @@ add_library(helios)
 find_package(GDAL REQUIRED)
 find_package(tinyxml2 REQUIRED)
 find_package(glm REQUIRED)
-find_package(ZLIB REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system thread regex filesystem serialization iostreams random)
-find_package(Armadillo REQUIRED)
-find_package(BLAS REQUIRED)
-find_package(LAPACK REQUIRED)
+find_package(Armadillo CONFIG REQUIRED)
 
 # LasTools's CMake is not Modern CMake yet, so we have to use old-style find_package
 # that uses the provoded FindLASTools.cmake file
@@ -80,18 +77,15 @@ target_link_libraries(helios
     GDAL::GDAL
     tinyxml2::tinyxml2
     glm::glm
-    ZLIB::ZLIB
     Boost::system
     Boost::thread
     Boost::regex
     Boost::filesystem
     Boost::serialization
     Boost::iostreams
     Boost::random
-    BLAS::BLAS
-    LAPACK::LAPACK
     ${LASTOOLS_LIBRARIES}
-    ${ARMADILLO_LIBRARIES}
+    armadillo
 )
 
 target_include_directories(helios
@@ -123,7 +117,7 @@ endif()
 # Add the HelIOS++ executable
 add_executable(helios++)
 
-target_link_libraries(helios++ PUBLIC helios)
+target_link_libraries(helios++ PRIVATE helios)
 
 if(BUILD_PYTHON)
   find_package(Python COMPONENTS Interpreter Development)
@@ -132,7 +126,7 @@ if(BUILD_PYTHON)
   add_library(_pyhelios MODULE)
 
   target_link_libraries(_pyhelios
-  PUBLIC
+  PRIVATE
     helios
     Boost::python
     Python::Module
@@ -150,7 +144,9 @@ endif()
 add_subdirectory(src)
 
 # Add documentation building through the CMake build system
-add_subdirectory(doc)
+if(BUILD_DOCS)
+  add_subdirectory(doc)
+endif()
 
 # Add installation rules for the Helios++ executable and Python bindings library