add WITH_TESTS option. Install plugins into

Author: hobu

.github/workflows/build.yml

@@ -45,7 +45,7 @@ jobs:
     - name: Install
       shell: bash -l {0}
       run: |
-        pip install  .
+        pip install  . --install-option="-DWITH_TESTS=ON"
         pdal --drivers
 
     - name: Test
@@ -91,7 +91,7 @@ jobs:
 
         call conda activate test
         where python
-        python setup.py develop -- -G "Ninja"
+        python setup.py develop -- -G "Ninja" -DWITH_TESTS=ON
 
     - name: Test
       shell: cmd /C CALL "{0}"

pdal/CMakeLists.txt

@@ -7,9 +7,9 @@ include(${PROJECT_SOURCE_DIR}/macros.cmake NO_POLICY_SCOPE)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+option(WITH_TESTS "Enable tests" OFF)
 set(CMAKE_BUILD_TYPE "Release")
 
-enable_testing()
 
 # Python-finding settings
 set(Python3_FIND_STRATEGY "LOCATION")
@@ -95,13 +95,6 @@ PDAL_PYTHON_ADD_PLUGIN(numpy_reader reader numpy
         ${PYTHON_LINK_LIBRARY}
     )
 
-
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-add_subdirectory(test/gtest)
-enable_testing()
-include_directories(test/gtest/include .. ${CMAKE_CURRENT_BINARY_DIR})
-
-
 PDAL_PYTHON_ADD_PLUGIN(python_filter filter python
     FILES
         ./filters/PythonFilter.cpp
@@ -122,40 +115,52 @@ PDAL_PYTHON_ADD_PLUGIN(python_filter filter python
         ${PYTHON_LINK_LIBRARY}
     )
 
-PDAL_PYTHON_ADD_TEST(pdal_io_numpy_test
-    FILES
-        ./test/NumpyReaderTest.cpp
-        ./test/Support.cpp
-        ./plang/Invocation.cpp
-        ./plang/Environment.cpp
-        ./plang/Redirector.cpp
-        ./plang/Script.cpp
-    LINK_WITH
-        ${numpy_reader}
-        ${Python3_LIBRARIES}
-        ${PDAL_LIBRARIES}
-        ${CMAKE_DL_LIBS}
-    SYSTEM_INCLUDES
-        ${PDAL_INCLUDE_DIRS}
-        ${Python3_INCLUDE_DIRS}
-        ${Python3_NumPy_INCLUDE_DIRS}
-)
 
-PDAL_PYTHON_ADD_TEST(pdal_filters_python_test
-    FILES
-        ./test/PythonFilterTest.cpp
-        ./test/Support.cpp
-        ./plang/Invocation.cpp
-        ./plang/Environment.cpp
-        ./plang/Redirector.cpp
-        ./plang/Script.cpp
-    LINK_WITH
-        ${python_filter}
-        ${Python3_LIBRARIES}
-        ${PDAL_LIBRARIES}
-        ${CMAKE_DL_LIBS}
-    SYSTEM_INCLUDES
-        ${PDAL_INCLUDE_DIRS}
-        ${Python3_INCLUDE_DIRS}
-        ${Python3_NumPy_INCLUDE_DIRS}
-)
+if (WITH_TESTS)
+    enable_testing()
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    add_subdirectory(test/gtest)
+    enable_testing()
+    include_directories(test/gtest/include .. ${CMAKE_CURRENT_BINARY_DIR})
+
+
+
+
+    PDAL_PYTHON_ADD_TEST(pdal_io_numpy_test
+        FILES
+            ./test/NumpyReaderTest.cpp
+            ./test/Support.cpp
+            ./plang/Invocation.cpp
+            ./plang/Environment.cpp
+            ./plang/Redirector.cpp
+            ./plang/Script.cpp
+        LINK_WITH
+            ${numpy_reader}
+            ${Python3_LIBRARIES}
+            ${PDAL_LIBRARIES}
+            ${CMAKE_DL_LIBS}
+        SYSTEM_INCLUDES
+            ${PDAL_INCLUDE_DIRS}
+            ${Python3_INCLUDE_DIRS}
+            ${Python3_NumPy_INCLUDE_DIRS}
+    )
+
+    PDAL_PYTHON_ADD_TEST(pdal_filters_python_test
+        FILES
+            ./test/PythonFilterTest.cpp
+            ./test/Support.cpp
+            ./plang/Invocation.cpp
+            ./plang/Environment.cpp
+            ./plang/Redirector.cpp
+            ./plang/Script.cpp
+        LINK_WITH
+            ${python_filter}
+            ${Python3_LIBRARIES}
+            ${PDAL_LIBRARIES}
+            ${CMAKE_DL_LIBS}
+        SYSTEM_INCLUDES
+            ${PDAL_INCLUDE_DIRS}
+            ${Python3_INCLUDE_DIRS}
+            ${Python3_NumPy_INCLUDE_DIRS}
+    )
+endif (WITH_TESTS)

pdal/macros.cmake

@@ -91,7 +91,7 @@ macro(PDAL_PYTHON_ADD_PLUGIN _name _type _shortname)
             ${WINSOCK_LIBRARY}
     )
     install(TARGETS ${${_name}}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_DIR}
+        LIBRARY DESTINATION ${PROJECT_NAME}
         )
     if (APPLE)
         set_target_properties(${${_name}} PROPERTIES
@@ -109,7 +109,7 @@ macro(PDAL_PYTHON_ADD_TEST _name)
         set(WINSOCK_LIBRARY ws2_32)
     endif()
     add_executable(${_name} ${PDAL_PYTHON_ADD_TEST_FILES})
-        
+
     pdal_python_target_compile_settings(${_name})
     target_include_directories(${_name} PRIVATE
         ${PDAL_PYTHON_ADD_TEST_INCLUDES})

pdal/plang/Environment.cpp

@@ -111,9 +111,10 @@ Environment::Environment()
     // the return.
     auto initNumpy = []()
     {
-#undef NUMPY_IMPORT_ARRAY_RETVAL
-#define NUMPY_IMPORT_ARRAY_RETVAL
-        import_array();
+// #undef NUMPY_IMPORT_ARRAY_RETVAL
+// #define NUMPY_IMPORT_ARRAY_RETVAL VOID
+        _import_array();
+        return ;
     };
 
     if (!Py_IsInitialized())