move pyd files into nuwe_pyeccodes to install by pip.

perillaroc · Aug 12, 2018 · 7ef33a8 · 7ef33a8
1 parent 92266ea
commit 7ef33a8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 21 deletions.
diff --git a/example/message_handler/CMakeLists.txt b/example/message_handler/CMakeLists.txt
@@ -1,10 +1,10 @@
-project(example_message_handler)
+#project(example_message_handler)
 
 set(TEST_DATA_ROOT ${NUWE_DATA_ROOT})
 
 configure_file (
-	"${PROJECT_SOURCE_DIR}/example_config.h.in"
-    "${PROJECT_BINARY_DIR}/example_config.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/example_config.h.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/example_config.h"
 )
 
 add_executable(example_message_handler main.cpp)
@@ -14,5 +14,5 @@ target_link_libraries(example_message_handler PUBLIC
 )
 
 target_include_directories(example_message_handler PUBLIC
-	${PROJECT_BINARY_DIR}
+	${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/src/grib_message_handler/CMakeLists.txt b/src/grib_message_handler/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(grib_message_handler)
+#project(grib_message_handler)
 
 set(SOURCE_FILES
 	src/grib_message_handler.cpp
@@ -10,7 +10,7 @@ add_library(grib_message_handler STATIC ${SOURCE_FILES})
 
 target_include_directories(grib_message_handler 
 	INTERFACE
-		${PROJECT_SOURCE_DIR}/src
+		${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
 target_link_libraries(grib_message_handler PUBLIC

diff --git a/src/pyeccodes/CMakeLists.txt b/src/pyeccodes/CMakeLists.txt
@@ -1,20 +1,26 @@
-project(pyeccodes)
+#project(pyeccodes)
 
 find_package(pybind11 REQUIRED)
 
-pybind11_add_module(nuwe_pyeccodes nuwe_pyeccodes.cpp)
+pybind11_add_module(_pyeccodes nuwe_pyeccodes.cpp)
+
+set(PYECCODES_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/nuwe_pyeccodes)
 
 configure_file (
-	"${PROJECT_SOURCE_DIR}/setup.py.in"
-    "${PROJECT_BINARY_DIR}/setup.py"
+	"${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/setup.py"
 )
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/nuwe_pyeccodes DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-target_link_libraries(nuwe_pyeccodes PUBLIC
+target_link_libraries(_pyeccodes PUBLIC
 	NuwePyeccodes::grib_message_handler
 )
 
-set_target_properties(nuwe_pyeccodes PROPERTIES
-	RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
-	LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
-	ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
-)
+set_target_properties(_pyeccodes PROPERTIES
+	RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PYECCODES_OUTPUT_DIRECTORY}
+	RUNTIME_OUTPUT_DIRECTORY_Release ${PYECCODES_OUTPUT_DIRECTORY}
+	LIBRARY_OUTPUT_DIRECTORY_DEBUG ${PYECCODES_OUTPUT_DIRECTORY}
+	LIBRARY_OUTPUT_DIRECTORY_Release ${PYECCODES_OUTPUT_DIRECTORY}
+	ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${PYECCODES_OUTPUT_DIRECTORY}
+	ARCHIVE_OUTPUT_DIRECTORY_Release ${PYECCODES_OUTPUT_DIRECTORY}
+)
diff --git a/src/pyeccodes/nuwe_pyeccodes.cpp b/src/pyeccodes/nuwe_pyeccodes.cpp
@@ -9,7 +9,7 @@
 namespace py = pybind11;
 using namespace pyeccodes;
 
-PYBIND11_MODULE(nuwe_pyeccodes, m) {
+PYBIND11_MODULE(_pyeccodes, m) {
 	py::class_<GribMessageHandler>(m, "GribMessageHandler")
 		.def(py::init<>())
 		.def("getSize", &GribMessageHandler::getSize)

diff --git a/src/pyeccodes/nuwe_pyeccodes/__init__.py b/src/pyeccodes/nuwe_pyeccodes/__init__.py
@@ -0,0 +1,2 @@
+# coding: utf-8
+from ._pyeccodes import *
diff --git a/src/pyeccodes/setup.py.in b/src/pyeccodes/setup.py.in
@@ -3,12 +3,13 @@ from setuptools import setup, find_packages
 setup(
     name="nuwe_pyeccodes",
     version="0.1.0",
-    packages=['nuwe_eccodes'],
 	install_requires=['numpy'],
+	include_package_data=True,
+	packages=["nuwe_pyeccodes"],
 	package_data={
-		'nuwe_eccodes': [
-			'@PROJECT_BINARY_DIR@/*.lib',
-			'@PROJECT_BINARY_DIR@/*.pyd',
+		'': [
+			'*.lib',
+			'*.pyd',
 		]
 	}
 )