suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: reset shiboken-cmake-suffix for python < 3

Browse Source
This commit is contained in:
looooo 2017-03-04 11:41:13 +01:00 committed by Yorik van Havre
parent 256791d42e
commit 0196d50c48
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -903,11 +903,15 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
) )
endif() endif()
else() else()
if (PYTHON_VERSION_MAJOR LESS 3)
SET(PYTHON_SUFFIX -python2.7)
SET(PYTHON_BASENAME -python2.7)
else(PYTHON_VERSION_MAJOR LESS 3)
# set(PYTHON_SUFFIX -python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) # set(PYTHON_SUFFIX -python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
# below are two variables that can be left empty for standard python, but must be set by the user for different python versions such as 3.5 # below are two variables that can be left empty for standard python, but must be set by the user for different python versions such as 3.5
SET(PYTHON_SUFFIX "" CACHE STRING "Shiboken cmake file suffix. If left empty, system default python version will be used: <ShibokenConfigPYTHON_SUFFIX.cmake>") SET(PYTHON_SUFFIX "" CACHE STRING "Shiboken cmake file suffix. If left empty, system default python version will be used: <ShibokenConfigPYTHON_SUFFIX.cmake>")
SET(PYTHON_BASENAME "" CACHE STRING "Same as PYTHON_SUFFIX but for PySide. if left empty, PYTHON_SUFFIX will be used: <PySideConfigPYTHON_BASENAME.cmake>") SET(PYTHON_BASENAME "" CACHE STRING "Same as PYTHON_SUFFIX but for PySide. if left empty, PYTHON_SUFFIX will be used: <PySideConfigPYTHON_BASENAME.cmake>")
endif(PYTHON_VERSION_MAJOR LESS 3)
if(DEFINED MACPORTS_PREFIX) if(DEFINED MACPORTS_PREFIX)
find_package(Shiboken REQUIRED HINTS "${PYTHON_LIBRARY_DIR}/cmake") find_package(Shiboken REQUIRED HINTS "${PYTHON_LIBRARY_DIR}/cmake")
find_package(PySide REQUIRED HINTS "${PYTHON_LIBRARY_DIR}/cmake") find_package(PySide REQUIRED HINTS "${PYTHON_LIBRARY_DIR}/cmake")