Add new variables to build.

SCIInstitute · Feb 12, 2016 · 475d77e · 475d77e
1 parent a652d76
commit 475d77e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Superbuild/PythonConfig.cmake.in b/Superbuild/PythonConfig.cmake.in
@@ -39,6 +39,8 @@ if(WIN32 AND MSVC)
   set(SCI_PYTHON_LIBRARY_DEBUG "@SCI_PYTHON_LIBRARY_DEBUG@")
   set(SCI_PYTHON_DLL_PATH "@SCI_PYTHON_DLL_PATH@")
   set(SCI_PYTHON_DLL_DEBUG_PATH "@SCI_PYTHON_DLL_DEBUG_PATH@")
+  set(SCI_PYTHON_MODULE_PARENT_PATH "@SCI_PYTHON_MODULE_PARENT_PATH@")
+  set(SCI_PYTHON_NAME "@SCI_PYTHON_NAME@")
 endif()
 
 if(APPLE)

diff --git a/Superbuild/PythonExternal.cmake b/Superbuild/PythonExternal.cmake
@@ -118,6 +118,7 @@ ENDIF()
 ExternalProject_Get_Property(Python_external SOURCE_DIR)
 ExternalProject_Get_Property(Python_external INSTALL_DIR)
 
+SET(SCI_PYTHON_MODULE_PARENT_PATH lib)
 
 IF(UNIX)
   SET(SCI_PYTHON_NAME python${SCI_PYTHON_VERSION_SHORT})
@@ -152,8 +153,8 @@ IF(UNIX)
     SET(SCI_PYTHON_LIBRARY ${SCI_PYTHON_NAME}${ABIFLAGS})
 
     # required by interpreter interface
-    SET(PYTHON_MODULE_SEARCH_PATH lib/${SCI_PYTHON_NAME} CACHE INTERNAL "Python modules." FORCE)
-    SET(SCI_PYTHON_MODULE_LIBRARY_PATH ${INSTALL_DIR}/lib/${SCI_PYTHON_NAME})
+    SET(PYTHON_MODULE_SEARCH_PATH ${SCI_PYTHON_MODULE_PARENT_PATH}/${SCI_PYTHON_NAME} CACHE INTERNAL "Python modules." FORCE)
+    SET(SCI_PYTHON_MODULE_LIBRARY_PATH ${INSTALL_DIR}/${SCI_PYTHON_MODULE_PARENT_PATH}/${SCI_PYTHON_NAME})
   ENDIF()
 ELSE()
   # Windows does not do install step
@@ -172,7 +173,7 @@ ELSE()
   SET(SCI_PYTHON_DLL_DEBUG_PATH ${SCI_PYTHON_ROOT_DIR}${python_WIN32_64BIT_DIR}/${SCI_PYTHON_NAME}${python_ABIFLAG_PYDEBUG}${CMAKE_SHARED_LIBRARY_SUFFIX})
 
   # required by interpreter interface
-  SET(PYTHON_MODULE_SEARCH_PATH lib/${SCI_PYTHON_NAME} CACHE INTERNAL "Python modules." FORCE)
+  SET(PYTHON_MODULE_SEARCH_PATH ${SCI_PYTHON_MODULE_PARENT_PATH}/${SCI_PYTHON_NAME} CACHE INTERNAL "Python modules." FORCE)
   SET(SCI_PYTHON_MODULE_LIBRARY_PATH ${SOURCE_DIR}/Lib)
 ENDIF()