Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-19 12:57:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-06-19 12:57:34 +0400
commitdef6bcd4e5152c9826ee9ca0ac40264264416400 (patch)
tree0c757e88c317537b320abc2435b29a1ea6d37fbb /build_files/cmake/Modules/FindPythonLibsUnix.cmake
parent167bcc2b6709177c0f93af8bf06db1c1a944eede (diff)
cmake add module for finding fftw3.
also allow debug blender to build with non debug python
Diffstat (limited to 'build_files/cmake/Modules/FindPythonLibsUnix.cmake')
-rw-r--r--build_files/cmake/Modules/FindPythonLibsUnix.cmake12
1 files changed, 7 insertions, 5 deletions
diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
index 5df12c5d31b..d825adbc496 100644
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -22,7 +22,9 @@ set(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
mark_as_advanced(PYTHON_LINKFLAGS)
set(_python_ABI_FLAGS
- "m;mu;u; ")
+ "m;mu;u; " # release
+ "md;mud;ud" # debug
+)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
@@ -33,9 +35,9 @@ set(_python_SEARCH_DIRS
)
foreach(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS})
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
- set(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
- endif()
+ #if(CMAKE_BUILD_TYPE STREQUAL Debug)
+ # set(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
+ #endif()
string(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
find_path(PYTHON_INCLUDE_DIR
@@ -50,7 +52,7 @@ foreach(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS})
PATH_SUFFIXES lib64 lib
)
- if((EXISTS ${PYTHON_LIBRARIES}) AND (EXISTS ${PYTHON_INCLUDE_DIR}))
+ if(PYTHON_LIBRARIES AND PYTHON_INCLUDE_DIR)
break()
else()
# ensure we dont find values from 2 different ABI versions