Merge branch 'windows-packaging' of https://github.com/PDAL/PDAL into…

… windows-packaging
PDAL · May 16, 2017 · 15fe7d1 · 15fe7d1
2 parents 022bcc8 + 19c7928
commit 15fe7d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmake/examples/hobu-windows.bat b/cmake/examples/hobu-windows.bat
@@ -86,6 +86,7 @@ cmake -G %GENERATOR% ^
 	-DPYTHON_EXECUTABLE=%OSGEO4W_DIR%\apps\python36\python.exe ^
 	-DPYTHON_INCLUDE_DIR=%OSGEO4W_DIR%\apps\python36\include ^
 	-DPYTHON_LIBRARY=%OSGEO4W_DIR%\apps\python36\libs\python36.lib ^
+	-DPYTHON_DEBUG_LIBRARY=%OSGEO4W_DIR%\apps\python36\libs\python36.lib ^
 	-DCURL_INCLUDE_DIR=%CURL_INCLUDE_DIR% ^
 	-DCURL_LIBRARY=%CURL_LIBRARY% ^
 	-DNUMPY_INCLUDE_DIR=%OSGEO4W_DIR%\apps\python36\lib\site-packages\numpy\core\include ^

diff --git a/cmake/modules/FindNumPy.cmake b/cmake/modules/FindNumPy.cmake
@@ -12,8 +12,8 @@ IF (NUMPY_INCLUDE_DIR)
 endif (NUMPY_INCLUDE_DIR)
 
 # To set the variables PYTHON_EXECUTABLE
-FIND_PACKAGE(PythonInterp QUIET REQUIRED)
-FIND_PACKAGE(PythonLibs QUIET REQUIRED)
+FIND_PACKAGE(PythonInterp REQUIRED)
+FIND_PACKAGE(PythonLibs REQUIRED)
 
 # Look for the include path
 # WARNING: The variable PYTHON_EXECUTABLE is defined by the script FindPythonInterp.cmake