kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

CMake: Modernize build files using outdated Python variables.

Browse Source
This commit is contained in:
Joao Matos
2025-02-15 20:04:22 +00:00
committed by Chris Hennes
parent de9bd5e1ce
commit 27ebc68a11
72 changed files with 113 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/CAM/App/CMakeLists.txt
View File

@@ -10,7 +10,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}

2
src/Mod/CAM/Gui/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ include_directories(
${ZLIB_INCLUDE_DIR}
${OCC_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)

2
src/Mod/CAM/PathSimulator/App/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)

2
src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ include_directories(
${ZLIB_INCLUDE_DIR}
${OCC_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)

20
src/Mod/CAM/libarea/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ if(MSVC)
endif(MSVC)
include_directories(
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/Mod/Import/App/dxf
@@ -24,14 +24,14 @@ if(NOT FREECAD_USE_PYBIND11)
if (FORCE_BOOST_PY_SUFFIX)
set(BOOST_PY_SUFFIX ${FORCE_BOOST_PY_SUFFIX})
else ()
set(BOOST_PY_SUFFIX ${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
set(BOOST_PY_SUFFIX ${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
endif ()
find_package( Boost COMPONENTS python${BOOST_PY_SUFFIX} )
if (NOT Boost_PYTHON${BOOST_PY_SUFFIX}_FOUND)
# try just the major version
find_package( Boost COMPONENTS python${PYTHON_VERSION_MAJOR} )
if (NOT Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
find_package( Boost COMPONENTS python${Python3_VERSION_MAJOR} )
if (NOT Boost_PYTHON${Python3_VERSION_MAJOR}_FOUND)
# unversioned
find_package( Boost COMPONENTS python REQUIRED)
endif()
@@ -135,7 +135,7 @@ if(MSVC)
${area_native_LIBS}
)
if(BUILD_DYNAMIC_LINK_PYTHON)
list(APPEND area_LIBS ${PYTHON_LIBRARIES})
list(APPEND area_LIBS ${Python3_LIBRARIES})
endif(BUILD_DYNAMIC_LINK_PYTHON)
elseif(MINGW)
set(area_native_LIBS
@@ -146,7 +146,7 @@ elseif(MINGW)
${area_native_LIBS}
)
if(BUILD_DYNAMIC_LINK_PYTHON)
list(APPEND area_LIBS ${PYTHON_LIBRARIES})
list(APPEND area_LIBS ${Python3_LIBRARIES})
endif(BUILD_DYNAMIC_LINK_PYTHON)
else(MSVC)
set(area_native_LIBS
@@ -155,7 +155,7 @@ else(MSVC)
${Boost_LIBRARIES}
)
if(BUILD_DYNAMIC_LINK_PYTHON)
list(APPEND area_LIBS ${PYTHON_LIBRARIES})
list(APPEND area_LIBS ${Python3_LIBRARIES})
endif(BUILD_DYNAMIC_LINK_PYTHON)
endif(MSVC)
@@ -178,15 +178,15 @@ SET_BIN_DIR(area area /Mod/CAM)
SET_PYTHON_PREFIX_SUFFIX(area)
# this figures out where to install the Python modules
if (${PYTHON_VERSION_STRING} VERSION_LESS "3.10")
if (${Python3_VERSION} VERSION_LESS "3.10")
# deprecated distutils package still required for ubuntu 20.04 and similar
# see https://bugs.launchpad.net/ubuntu/+source/python3.8/+bug/2039511
# TODO: remove this once we drop support for 20.04
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
"from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"
OUTPUT_VARIABLE Python_site_packages OUTPUT_STRIP_TRAILING_WHITESPACE )
else()
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
"from sysconfig import get_path; print(get_path('platlib'))"
OUTPUT_VARIABLE Python_site_packages OUTPUT_STRIP_TRAILING_WHITESPACE )
endif()