bad merge

hobu · hobu · commit fe2251f0722d · 2020-12-08T09:18:49.000-06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,15 @@ set(Python3_FIND_REGISTRY "LAST")
 set(Python3_FIND_FRAMEWORK "LAST")
 find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    # For newer versions of python (3.8+), C extensions don't link against
+    # libpython and instead get symbol definitions from the python interpreter
+    # executable. PDAL plugins need to link against libpython, but if a plugin
+    # is loaded inside a python process, it must resolve symbols from the python
+    # executable instead of libpython. Using flat namespace allows that.
+    set(PYTHON_LINK_LIBRARY ${PYTHON_LINK_LIBRARY} -Wl,-flat_namespace)
+endif()
+
 # find PDAL. Require 2.1+
 find_package(PDAL 2.1 REQUIRED)
 
diff --git a/pdal/CMakeLists.txt b/pdal/CMakeLists.txt
@@ -21,64 +21,4 @@ python_extension_module(${extension})
 
 install(TARGETS ${extension} LIBRARY DESTINATION "pdal")
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    # For newer versions of python (3.8+), C extensions don't link against
-    # libpython and instead get symbol definitions from the python interpreter
-    # executable. PDAL plugins need to link against libpython, but if a plugin
-    # is loaded inside a python process, it must resolve symbols from the python
-    # executable instead of libpython. Using flat namespace allows that.
-    set(PYTHON_LINK_LIBRARY ${PYTHON_LINK_LIBRARY} -Wl,-flat_namespace)
-endif()
-
-PDAL_PYTHON_ADD_PLUGIN(numpy_reader reader numpy
-    FILES
-        ./io/NumpyReader.cpp
-        ./io/NumpyReader.hpp
-        ./plang/Invocation.cpp
-        ./plang/Environment.cpp
-        ./plang/Redirector.cpp
-        ./plang/Script.cpp
-    LINK_WITH
-        ${PDAL_LIBRARIES}
-        ${Python3_LIBRARIES}
-        ${CMAKE_DL_LIBS}
-    SYSTEM_INCLUDES
-        ${PDAL_INCLUDE_DIRS}
-        ${Python3_INCLUDE_DIRS}
-        ${Python3_NumPy_INCLUDE_DIRS}
-    COMPILE_OPTIONS
-        ${PYTHON_LINK_LIBRARY}
-    )
-
-PDAL_PYTHON_ADD_PLUGIN(python_filter filter python
-    FILES
-        ./filters/PythonFilter.cpp
-        ./filters/PythonFilter.hpp
-        ./plang/Invocation.cpp
-        ./plang/Environment.cpp
-        ./plang/Redirector.cpp
-        ./plang/Script.cpp
-    LINK_WITH
-        ${PDAL_LIBRARIES}
-        ${Python3_LIBRARIES}
-        ${CMAKE_DL_LIBS}
-    SYSTEM_INCLUDES
-        ${PDAL_INCLUDE_DIRS}
-        ${Python3_INCLUDE_DIRS}
-        ${Python3_NumPy_INCLUDE_DIRS}
-    COMPILE_OPTIONS
-        ${PYTHON_LINK_LIBRARY}
-    )
-
-
-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})
-
-
-
-
 
