diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-03 01:35:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-03 01:35:00 +0400 |
commit | b07d92408b3ca76e00ea0e69203418fee49b5e19 (patch) | |
tree | d78695b5f09b82b30fe86791213d01ba310b8575 /build_files/cmake/Modules | |
parent | 723e129252f82cc81faa8834a68c79e4439ee8fa (diff) |
cmake could ignore defines for python lib/include passed from the command line if both weren't defined.
Diffstat (limited to 'build_files/cmake/Modules')
-rw-r--r-- | build_files/cmake/Modules/FindPythonLibsUnix.cmake | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index fd5d20920da..8c3ff64d3f3 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -44,8 +44,19 @@ SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic" CACHE STRING "Linker flags for p MARK_AS_ADVANCED(PYTHON_LINKFLAGS) +# if the user passes these defines as args, we dont want to overwrite +SET(_IS_INC_DEF OFF) +SET(_IS_LIB_DEF OFF) +IF(DEFINED PYTHON_INCLUDE_DIR) + SET(_IS_INC_DEF ON) +ENDIF() +IF(DEFINED PYTHON_LIBRARY) + SET(_IS_LIB_DEF ON) +ENDIF() + + # only search for the dirs if we havn't already -IF((NOT DEFINED PYTHON_INCLUDE_DIR) OR (NOT DEFINED PYTHON_LIBRARY)) +IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF)) SET(_python_ABI_FLAGS "m;mu;u; " # release @@ -66,30 +77,38 @@ IF((NOT DEFINED PYTHON_INCLUDE_DIR) OR (NOT DEFINED PYTHON_LIBRARY)) #ENDIF() STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS}) - FIND_PATH(PYTHON_INCLUDE_DIR - NAMES - Python.h - HINTS - ${_python_SEARCH_DIRS} - PATH_SUFFIXES - include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} - ) - - FIND_LIBRARY(PYTHON_LIBRARY - NAMES - "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}" - HINTS - ${_python_SEARCH_DIRS} - PATH_SUFFIXES - lib64 lib - ) + IF(NOT DEFINED PYTHON_INCLUDE_DIR) + FIND_PATH(PYTHON_INCLUDE_DIR + NAMES + Python.h + HINTS + ${_python_SEARCH_DIRS} + PATH_SUFFIXES + include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} + ) + ENDIF() + + IF(NOT DEFINED PYTHON_LIBRARY) + FIND_LIBRARY(PYTHON_LIBRARY + NAMES + "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}" + HINTS + ${_python_SEARCH_DIRS} + PATH_SUFFIXES + lib64 lib + ) + ENDIF() IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR) break() ELSE() # ensure we dont find values from 2 different ABI versions - UNSET(PYTHON_INCLUDE_DIR CACHE) - UNSET(PYTHON_LIBRARY CACHE) + IF(NOT _IS_INC_DEF) + UNSET(PYTHON_INCLUDE_DIR CACHE) + ENDIF() + IF(NOT _IS_LIB_DEF) + UNSET(PYTHON_LIBRARY CACHE) + ENDIF() ENDIF() ENDFOREACH() @@ -100,6 +119,9 @@ IF((NOT DEFINED PYTHON_INCLUDE_DIR) OR (NOT DEFINED PYTHON_LIBRARY)) UNSET(_python_SEARCH_DIRS) ENDIF() +UNSET(_IS_INC_DEF) +UNSET(_IS_LIB_DEF) + # handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) |