summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-08-17 19:15:04 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-08-17 19:15:04 (GMT)
commit69252437efaf340b0e55b8560a4ad11ec5c2727b (patch)
tree2cd7addb4cd16d2b55c2c6f82ece5672de894d7c
parentda6fc97f19f0240e65222198a176e96334dcf8fa (diff)
parent42fd9a596fdc300855f5c8d2f755c0a2181ffd34 (diff)
downloadCMake-69252437efaf340b0e55b8560a4ad11ec5c2727b.zip
CMake-69252437efaf340b0e55b8560a4ad11ec5c2727b.tar.gz
CMake-69252437efaf340b0e55b8560a4ad11ec5c2727b.tar.bz2
Merge topic 'python_add_module_scope'
42fd9a5 Bug with default library type of Python modules.
-rw-r--r--Modules/FindPythonLibs.cmake6
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 423d5dd..d12f14a 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -105,11 +105,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs DEFAULT_MSG PYTHON_LIBRARIES PYTHON
# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
# PYTHON_WRITE_MODULES_HEADER(<filename>) writes a header file you can include
# in your sources to initialize the static python modules
-
-GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS
- GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
-
FUNCTION(PYTHON_ADD_MODULE _NAME )
+ GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS
+ GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
OPTION(PYTHON_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE)
OPTION(PYTHON_MODULE_${_NAME}_BUILD_SHARED
"Add module ${_NAME} shared" ${_TARGET_SUPPORTS_SHARED_LIBS})