Standalone plugin builds (PDAL#4177)

* use PROJECT_SOURCE_DIR for building -DSTANDALONE * try CMAKE_CURRENT_LIST_DIR * CMAKE_CURRENT_LIST_DIR * CMAKE_CURRENT_SOURCE_DIR for standalone.cmake * more standalone * condition test building with STANDALONE * move PDAL-finding to bottom of STANDALONE ops
koordinates · Sep 18, 2023 · 810b876 · 810b876
1 parent 702ca29
commit 810b876
Show file tree

Hide file tree

Showing 16 changed files with 381 additions and 35 deletions.
diff --git a/cmake/standalone.cmake b/cmake/standalone.cmake
@@ -1,4 +1,4 @@
-set(ROOT_DIR "${CMAKE_SOURCE_DIR}/../..")
+set(ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
 
 get_filename_component(ROOT_DIR "${ROOT_DIR}" ABSOLUTE)
 

diff --git a/plugins/draco/CMakeLists.txt b/plugins/draco/CMakeLists.txt
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-draco)
-    find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
+
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
     include(${PDAL_CMAKE_DIR}/arbiter.cmake)
     include(${PDAL_CMAKE_DIR}/nlohmann.cmake)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
-
+    add_subdirectory("${PROJECT_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
+    find_package(PDAL REQUIRED)    
 endif(STANDALONE)
 
 
@@ -73,7 +73,7 @@ if (UNIX)
 endif()
 
 
-if (WITH_TESTS)
+if (WITH_TESTS AND NOT STANDALONE)
 
     PDAL_ADD_TEST(pdal_io_draco_writer_test
         FILES

diff --git a/plugins/draco/build/build.ninja b/plugins/draco/build/build.ninja
diff --git a/plugins/e57/CMakeLists.txt b/plugins/e57/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
-    include(../../cmake/standalone.cmake NO_POLICY_SCOPE)
+    find_package(PDAL REQUIRED)
+    include("${PROJECT_SOURCE_DIR}/../../cmake/standalone.cmake" )
 endif(STANDALONE)
 
 

diff --git a/plugins/hdf/CMakeLists.txt b/plugins/hdf/CMakeLists.txt
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-hdf)
-    find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
     include(${PDAL_CMAKE_DIR}/arbiter.cmake)
     include(${PDAL_CMAKE_DIR}/nlohmann.cmake)
     include(${PDAL_CMAKE_DIR}/libxml2.cmake)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
+    add_subdirectory("${PROJECT_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
+    find_package(PDAL REQUIRED)
 endif(STANDALONE)
 
 #
@@ -33,7 +33,7 @@ PDAL_ADD_PLUGIN(libname reader hdf
         ${NLOHMANN_INCLUDE_DIR}
 )
 
-if (WITH_TESTS)
+if (WITH_TESTS AND NOT STANDALONE)
     PDAL_ADD_TEST(pdal_io_hdf_reader_test
         FILES test/HdfReadertest.cpp
         LINK_WITH ${libname}

diff --git a/plugins/icebridge/CMakeLists.txt b/plugins/icebridge/CMakeLists.txt
@@ -2,13 +2,12 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-icebridge)
-    find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
     include(${PDAL_CMAKE_DIR}/arbiter.cmake)
     include(${PDAL_CMAKE_DIR}/nlohmann.cmake)
     include(${PDAL_CMAKE_DIR}/libxml2.cmake)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
-
+    add_subdirectory("${PROJECT_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
+    find_package(PDAL REQUIRED)
 endif(STANDALONE)
 
 #

diff --git a/plugins/nitf/CMakeLists.txt b/plugins/nitf/CMakeLists.txt
@@ -2,12 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-nitf)
-    find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
     include(${PDAL_CMAKE_DIR}/arbiter.cmake)
     include(${PDAL_CMAKE_DIR}/nlohmann.cmake)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
-
+    add_subdirectory("${PROJECT_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
+    find_package(PDAL REQUIRED)
 endif(STANDALONE)
 
 #
@@ -65,7 +64,7 @@ if (WIN32)
     )
 endif()
 
-if (WITH_TESTS)
+if (WITH_TESTS AND NOT STANDALONE)
     PDAL_ADD_TEST(pdal_io_nitf_writer_test
         FILES
             test/NitfWriterTest.cpp

diff --git a/plugins/openscenegraph/CMakeLists.txt b/plugins/openscenegraph/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-openscenegraph)
-    include(../../cmake/standalone.cmake NO_POLICY_SCOPE)
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
+    find_package(PDAL REQUIRED)
 endif(STANDALONE)
 
 #

diff --git a/plugins/pgpointcloud/CMakeLists.txt b/plugins/pgpointcloud/CMakeLists.txt
@@ -2,13 +2,12 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-pgpointcloud)
-    find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
     include(${PDAL_CMAKE_DIR}/arbiter.cmake)
     include(${PDAL_CMAKE_DIR}/nlohmann.cmake)
     include(${PDAL_CMAKE_DIR}/libxml2.cmake)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
-
+    add_subdirectory("${PROJECT_SOURCE_DIR}/../../vendor/arbiter" "vendor/arbiter")
+    find_package(PDAL REQUIRED)
 endif(STANDALONE)
 
 #

diff --git a/plugins/rdb/CMakeLists.txt b/plugins/rdb/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-rdb)
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
     find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
 endif(STANDALONE)
 
 find_package(rdb COMPONENTS REQUIRED)

diff --git a/plugins/rxp/CMakeLists.txt b/plugins/rxp/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-rxp)
-    find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
+    find_package(PDAL REQUIRED)    
 endif(STANDALONE)
 
 set(RXP_TEST_NAME rxptest)

diff --git a/plugins/teaser/CMakeLists.txt b/plugins/teaser/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
-    find_package(PDAL REQUIRED)
     include(../../cmake/standalone.cmake NO_POLICY_SCOPE)
+    find_package(PDAL REQUIRED)
 endif(STANDALONE)
 
 find_package(OpenMP QUIET REQUIRED)

diff --git a/plugins/tiledb/CMakeLists.txt b/plugins/tiledb/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-tiledb)
-    find_package(PDAL REQUIRED)
-    include("${CMAKE_SOURCE_DIR}/../../cmake/standalone.cmake" )
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" )
     include(${PDAL_CMAKE_DIR}/nlohmann.cmake)
+    find_package(PDAL REQUIRED)
 endif(STANDALONE)
 
 #
@@ -49,7 +49,7 @@ PDAL_ADD_PLUGIN(writer_libname writer tiledb
         ${NLOHMANN_INCLUDE_DIR}
 )
 
-if (WITH_TESTS)
+if (WITH_TESTS AND NOT STANDALONE)
 
     PDAL_ADD_TEST(pdal_io_tiledb_utils_test
         FILES

diff --git a/plugins/trajectory/CMakeLists.txt b/plugins/trajectory/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.13)
 
 if (STANDALONE)
     project(pdal-trajectory)
-    find_package(PDAL REQUIRED)
-    include(../../cmake/standalone.cmake NO_POLICY_SCOPE)
+    include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/standalone.cmake" NO_POLICY_SCOPE)
+    find_package(PDAL REQUIRED)    
 endif(STANDALONE)
 
 

diff --git a/scripts/conda/standalone.bat b/scripts/conda/standalone.bat
@@ -0,0 +1,17 @@
+
+mkdir build
+cd build
+echo "conda prefix" %CONDA_PREFIX%
+
+
+cmake .. ^
+      -DSTANDALONE=ON ^
+      -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%" ^
+      -DCMAKE_BUILD_TYPE=Release ^
+      -DPDAL_DIR="%CONDA_PREFIX%" ^
+      -DBUILD_PLUGIN_DRACO=ON ^
+  -G Ninja
+REM ninja
+REM ninja install
+
+
diff --git a/vendor/utfcpp/CMakeLists.txt b/vendor/utfcpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.13)
 project (utf8cpp VERSION 3.2.2 LANGUAGES CXX)
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)