Merge pull request #73 from scikit-build/59-bundle-cmake-files

Relocate CMake modules to facilitate re-use. See #59
scikit-build · Jul 18, 2016 · cd09c23 · cd09c23
2 parents 20404b3 + 962c877
commit cd09c23
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean-pyc clean-build docs clean
+.PHONY: clean-pyc clean-build clean-skbuild docs clean
 
 help:
 	@echo "$(MAKE) [target]"
@@ -15,7 +15,7 @@ help:
 	@echo "    dist        - package"
 	@echo
 
-clean: clean-build clean-pyc
+clean: clean-build clean-pyc clean-skbuild
 	rm -fr htmlcov/
 
 clean-build:
@@ -28,6 +28,9 @@ clean-pyc:
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
 
+clean-skbuild:
+	find tests/samples/*/_skbuild/ -type d -exec rm -rf {} +
+
 lint:
 	flake8 skbuild tests
 

diff --git a/setup.py b/setup.py
@@ -26,10 +26,15 @@
     author='The scikit-build team',
     author_email='scikit-build@googlegroups.com',
     url='https://github.com/scikit-build/scikit-build',
-    packages=['skbuild', 'skbuild.platform_specifics', 'skbuild.command'],
+    packages=[
+        'skbuild',
+        'skbuild.platform_specifics',
+        'skbuild.command',
+    ],
     package_dir={'skbuild': 'skbuild',
                  'skbuild.platform_specifics': 'skbuild/platform_specifics',
                  'skbuild.command': 'skbuild/command'},
+    package_data={'skbuild': ['resources/cmake/*.cmake']},
     include_package_data=True,
     install_requires=requirements,
     license="MIT",

diff --git a/skbuild/cmaker.py b/skbuild/cmaker.py
@@ -242,6 +242,8 @@ def configure(self, clargs=(), generator_id=None):
                '-DPYTHON_INCLUDE_DIR:PATH=' + python_include_dir,
                '-DPYTHON_LIBRARY:FILEPATH=' + python_library,
                '-DSKBUILD:BOOL=TRUE',
+               "-DCMAKE_MODULE_PATH:PATH={}".format(
+                   os.path.dirname(__file__) + '/resources/cmake')
                ]
 
         cmd.extend(clargs)

diff --git a/tests/samples/cmake-files/FindCython.cmake → skbuild/resources/cmake/FindCython.cmake b/tests/samples/cmake-files/FindCython.cmake → skbuild/resources/cmake/FindCython.cmake
diff --git a/...es/cmake-files/FindPythonExtensions.cmake → ...esources/cmake/FindPythonExtensions.cmake b/...es/cmake-files/FindPythonExtensions.cmake → ...esources/cmake/FindPythonExtensions.cmake
diff --git a/tests/samples/cmake-files/UseCython.cmake → skbuild/resources/cmake/UseCython.cmake b/tests/samples/cmake-files/UseCython.cmake → skbuild/resources/cmake/UseCython.cmake
diff --git a/...argetLinkLibrariesWithDynamicLookup.cmake → ...argetLinkLibrariesWithDynamicLookup.cmake b/...argetLinkLibrariesWithDynamicLookup.cmake → ...argetLinkLibrariesWithDynamicLookup.cmake
diff --git a/tests/samples/fail-outside-project-root/CMakeLists.txt b/tests/samples/fail-outside-project-root/CMakeLists.txt
@@ -2,8 +2,5 @@ cmake_minimum_required(VERSION 3.5.0)
 
 project(fail_outside_project_root)
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake-files)
-
 install(FILES dummy DESTINATION ..)
 
diff --git a/tests/samples/hello-cython/CMakeLists.txt b/tests/samples/hello-cython/CMakeLists.txt
@@ -5,9 +5,6 @@ project(hello_cython)
 include(CTest)
 enable_testing()
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake-files)
-
 find_package(PythonInterp REQUIRED)
 find_package(PythonLibs REQUIRED)
 find_package(PythonExtensions REQUIRED)

diff --git a/tests/samples/hello/CMakeLists.txt b/tests/samples/hello/CMakeLists.txt
@@ -5,9 +5,6 @@ project(hello)
 include(CTest)
 enable_testing()
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake-files)
-
 find_package(PythonInterp REQUIRED)
 find_package(PythonLibs REQUIRED)
 find_package(PythonExtensions REQUIRED)

diff --git a/tests/samples/pen2-cython/CMakeLists.txt b/tests/samples/pen2-cython/CMakeLists.txt
@@ -5,9 +5,6 @@ project(pen2_cython)
 include(CTest)
 enable_testing()
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake-files)
-
 find_package(PythonInterp REQUIRED)
 find_package(PythonLibs REQUIRED)
 find_package(PythonExtensions REQUIRED)

diff --git a/tests/samples/tower-of-babel/CMakeLists.txt b/tests/samples/tower-of-babel/CMakeLists.txt
@@ -5,9 +5,6 @@ project(tower_of_babel)
 include(CTest)
 enable_testing()
 
-set(CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake-files)
-
 find_package(PythonInterp REQUIRED)
 find_package(PythonLibs REQUIRED)
 find_package(PythonExtensions REQUIRED)