Merge remote-tracking branch 'origin/numpy'

plugins/python/CMakeLists.txt

@@ -4,32 +4,5 @@
 
 include(${PDAL_CMAKE_DIR}/python.cmake)
 
-
-set(plang_srcs
-    ./plang/Invocation.cpp
-    ./plang/Environment.cpp
-    ./plang/Redirector.cpp
-    ./plang/Script.cpp
-)
-set(PDAL_PLANG_LIB_NAME pdal_plang)
-PDAL_ADD_LIBRARY(${PDAL_PLANG_LIB_NAME} ${plang_srcs} )
-set_target_properties(${PDAL_PLANG_LIB_NAME} PROPERTIES
-    VERSION "${PDAL_BUILD_VERSION}"
-    SOVERSION "${PDAL_API_VERSION}"
-    CLEAN_DIRECT_OUTPUT 1)
-target_link_libraries(${PDAL_PLANG_LIB_NAME} PUBLIC
-    ${PDAL_BASE_LIB_NAME}
-    ${PDAL_UTIL_LIB_NAME}
-    ${PYTHON_LIBRARY})
-target_include_directories(${PDAL_PLANG_LIB_NAME} PRIVATE
-    ${PYTHON_INCLUDE_DIR}
-    ${PROJECT_BINARY_DIR}/include)
-install(TARGETS ${PLANG_LIB_NAME}
-    RUNTIME DESTINATION ${PDAL_BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${PDAL_LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR})
-
-
-
 add_subdirectory(filters)
 add_subdirectory(io)

plugins/python/filters/CMakeLists.txt

@@ -1,19 +1,25 @@
+set(PLANG ../plang/Invocation.cpp
+          ../plang/Environment.cpp
+          ../plang/Redirector.cpp
+          ../plang/Script.cpp)
+
 PDAL_ADD_PLUGIN(python_libname filter python
     FILES
+        ${PLANG}
         PythonFilter.cpp
     )
 target_include_directories(${python_libname} PRIVATE
     ${PYTHON_INCLUDE_DIR} ${PDAL_JSONCPP_INCLUDE_DIR})
 
 target_link_libraries(${python_libname} PUBLIC
-    ${PYTHON_LIBRARY} ${CMAKE_DL_LIBS} PRIVATE  ${PDAL_PLANG_LIB_NAME})
+    ${PYTHON_LIBRARY} ${CMAKE_DL_LIBS})
 
 if (WITH_TESTS)
-
     PDAL_ADD_TEST(pdal_filters_python_test
-        FILES ../test/PythonFilterTest.cpp
+        FILES
+            ../test/PythonFilterTest.cpp
+            ${PLANG}
         LINK_WITH ${programmable_libname} )
     target_link_libraries(pdal_filters_python_test PUBLIC
-        ${PYTHON_LIBRARY} ${CMAKE_DL_LIBS}  PRIVATE  ${PDAL_PLANG_LIB_NAME})
-
+        ${PYTHON_LIBRARY} ${CMAKE_DL_LIBS})
 endif()