kindred/create
1
1
Fork 0
Code Issues 53 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 146d8a356b
commit aace8f7bee
72 changed files with 113 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cMake/FindMatplotlib.cmake
View File

@@ -13,7 +13,7 @@ IF(Python3_Interpreter_FOUND)
# Try to import matplotlib into Python interpreter. Python
# interpreter was found previously as required package, so
# don't take care about this.
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
execute_process(COMMAND "${Python3_EXECUTABLE}" "-c"
"import matplotlib as m; print(m.__version__); print(m.__path__[0]);"
RESULT_VARIABLE _MATPLOTLIB_SEARCH_SUCCESS
OUTPUT_VARIABLE _MATPLOTLIB_VALUES

6
cMake/FindPySide2Tools.cmake
View File

@@ -5,7 +5,7 @@
if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
#pyside2 tools are often in same location as python interpreter
get_filename_component(PYTHON_BIN_DIR ${PYTHON_EXECUTABLE} PATH)
get_filename_component(PYTHON_BIN_DIR ${Python3_EXECUTABLE} PATH)
set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR})
endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -16,8 +16,8 @@ FIND_PACKAGE(Qt5 COMPONENTS Core Widgets)
IF(Qt5Core_VERSION VERSION_LESS 5.14)
# Legacy (< 5.14)
FIND_PROGRAM(PYSIDE2_UIC_EXECUTABLE NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} pyuic5 HINTS ${PYSIDE_BIN_DIR})
FIND_PROGRAM(PYSIDE2_RCC_EXECUTABLE NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} pyrcc5 HINTS ${PYSIDE_BIN_DIR})
FIND_PROGRAM(PYSIDE2_UIC_EXECUTABLE NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR} pyuic5 HINTS ${PYSIDE_BIN_DIR})
FIND_PROGRAM(PYSIDE2_RCC_EXECUTABLE NAMES pyside2-rcc pyside2-rcc-${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR} pyrcc5 HINTS ${PYSIDE_BIN_DIR})
set(UICOPTIONS "")
set(RCCOPTIONS "")
ELSE()

8
cMake/FreeCAD_Helpers/CreatePackagingTargets.cmake
View File

@@ -4,14 +4,14 @@ macro(CreatePackagingTargets)
#
#add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
add_custom_target(dist-git
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
--bindir=${CMAKE_BINARY_DIR}
--major=${PACKAGE_VERSION_MAJOR}
--minor=${PACKAGE_VERSION_MINOR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
add_custom_target(distdfsg-git
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
--bindir=${CMAKE_BINARY_DIR}
--major=${PACKAGE_VERSION_MAJOR}
--minor=${PACKAGE_VERSION_MINOR}
@@ -20,7 +20,7 @@ macro(CreatePackagingTargets)
)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX OR MINGW)
add_custom_target(distcheck-git
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
--bindir=${CMAKE_BINARY_DIR}
--major=${PACKAGE_VERSION_MAJOR}
--minor=${PACKAGE_VERSION_MINOR}
@@ -28,7 +28,7 @@ macro(CreatePackagingTargets)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
add_custom_target(distcheckdfsg-git
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
--bindir=${CMAKE_BINARY_DIR}
--major=${PACKAGE_VERSION_MAJOR}
--minor=${PACKAGE_VERSION_MINOR}

4
cMake/FreeCAD_Helpers/PrintFinalReport.cmake
View File

@@ -65,7 +65,7 @@ macro(PrintFinalReport)
simple(docdir ${CMAKE_INSTALL_DOCDIR})
simple(includedir ${CMAKE_INSTALL_INCLUDEDIR})
simple(libdir ${CMAKE_INSTALL_LIBDIR})
simple(Python "${Python3_VERSION} [${PYTHON_EXECUTABLE}] Suffix: [${PYTHON_CONFIG_SUFFIX}]")
simple(Python "${Python3_VERSION} [${Python3_EXECUTABLE}] Suffix: [${PYTHON_CONFIG_SUFFIX}]")
value(BLAS)
section_end()
@@ -84,7 +84,7 @@ macro(PrintFinalReport)
value(BUILD_VR)
value(CMAKE_PREFIX_PATH)
value(FREECAD_QT_VERSION)
value(PYTHON_EXECUTABLE)
value(Python3_EXECUTABLE)
value(PYTHON_LIBRARY)
value(FREECAD_CREATE_MAC_APP)
value(FREECAD_USE_PYBIND11)

13
cMake/FreeCAD_Helpers/SetupPython.cmake
View File

@@ -3,18 +3,7 @@ macro(SetupPython)
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
# For backwards compatibility with old CMake scripts
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
set(PYTHON_LIBRARY_DIRS ${Python3_LIBRARY_DIRS})
set(PYTHON_VERSION_STRING ${Python3_VERSION})
set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR})
set(PYTHON_VERSION_MINOR ${Python3_VERSION_MINOR})
set(PYTHON_VERSION_PATCH ${Python3_VERSION_PATCH})
set(PYTHONINTERP_FOUND ${Python3_Interpreter_FOUND})
if (${PYTHON_VERSION_STRING} VERSION_LESS "3.8")
if (${Python3_VERSION} VERSION_LESS "3.8")
message(FATAL_ERROR "To build FreeCAD you need at least Python 3.8\n")
endif()

8
cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
View File

@@ -128,7 +128,7 @@ macro(SetupShibokenAndPyside)
# Now try to import the shiboken Python module and print a warning if it can't be loaded
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION}"
COMMAND ${Python3_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION}"
RESULT_VARIABLE FAILURE
OUTPUT_VARIABLE PRINT_OUTPUT
)
@@ -140,7 +140,7 @@ macro(SetupShibokenAndPyside)
"==================================\n")
else()
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION};print(shiboken${SHIBOKEN_MAJOR_VERSION}.__version__, end='')"
COMMAND ${Python3_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION};print(shiboken${SHIBOKEN_MAJOR_VERSION}.__version__, end='')"
RESULT_VARIABLE FAILURE
OUTPUT_VARIABLE Shiboken_VERSION
)
@@ -154,7 +154,7 @@ macro(SetupShibokenAndPyside)
# Independent of the build option PySide modules must be loaded at runtime. Print a warning if it fails.
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};import os;print(os.path.dirname(PySide${PYSIDE_MAJOR_VERSION}.__file__), end='')"
COMMAND ${Python3_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};import os;print(os.path.dirname(PySide${PYSIDE_MAJOR_VERSION}.__file__), end='')"
RESULT_VARIABLE FAILURE
OUTPUT_VARIABLE PRINT_OUTPUT
)
@@ -165,7 +165,7 @@ macro(SetupShibokenAndPyside)
"================================\n")
else()
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};print(PySide${PYSIDE_MAJOR_VERSION}.__version__, end='')"
COMMAND ${Python3_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};print(PySide${PYSIDE_MAJOR_VERSION}.__version__, end='')"
RESULT_VARIABLE FAILURE
OUTPUT_VARIABLE PySide_VERSION
)

10
cMake/FreeCadMacros.cmake
View File

@@ -138,13 +138,13 @@ macro(generate_from_xml BASE_NAME)
if(NOT EXISTS "${SOURCE_CPP_PATH}")
# assures the source files are generated at least once
message(STATUS "${SOURCE_CPP_PATH}")
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}"
execute_process(COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
)
endif()
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.cpp"
COMMAND ${PYTHON_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.xml
COMMAND ${Python3_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.xml
MAIN_DEPENDENCY "${BASE_NAME}.xml"
DEPENDS
"${CMAKE_SOURCE_DIR}/src/Tools/bindings/templates/templateClassPyExport.py"
@@ -160,7 +160,7 @@ macro(generate_from_py BASE_NAME OUTPUT_FILE)
file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py" SOURCE_NATIVE_PATH)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}"
COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}"
COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}"
MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py"
DEPENDS "${TOOL_PATH}"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
@@ -173,7 +173,7 @@ macro(generate_from_any INPUT_FILE OUTPUT_FILE VARIABLE)
file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_FILE}" SOURCE_NATIVE_PATH)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}"
COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" "${VARIABLE}"
COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" "${VARIABLE}"
MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_FILE}"
DEPENDS "${TOOL_PATH}"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
@@ -279,7 +279,7 @@ ENDMACRO(SET_PYTHON_PREFIX_SUFFIX)
# install directory, and then appends the package name and "/include" to the end
macro(find_pip_package PACKAGE)
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -m pip show ${PACKAGE}
COMMAND ${Python3_EXECUTABLE} -m pip show ${PACKAGE}
RESULT_VARIABLE FAILURE
OUTPUT_VARIABLE PRINT_OUTPUT
)

2
package/fedora/freecad.spec
View File

@@ -204,7 +204,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS
-DPYTHON_SUFFIX=.%{py_suffix} \
-DPYSIDE_INCLUDE_DIR=/usr/include/PySide2 \
-DPYSIDE_LIBRARY=-lpyside2.%{py_suffix} \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-DPython3_EXECUTABLE:FILEPATH=/usr/bin/python3 \
-DMEDFILE_INCLUDE_DIRS=%{MEDFILE_INCLUDE_DIRS} \
-DOpenGL_GL_PREFERENCE=GLVND \
-DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin4 \

2
src/3rdParty/libkdtree/python-bindings/CMakeLists.txt vendored
View File

@@ -10,7 +10,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/..)
# Build the _kdtree python module
set_source_files_properties (py-kdtree.i PROPERTIES CPLUSPLUS ON)
swig_add_module (kdtree python py-kdtree.i)
swig_link_libraries (kdtree ${PYTHON_LIBRARIES})
swig_link_libraries (kdtree ${Python3_LIBRARIES})
# Copy the test file into the build dir
install (FILES py-kdtree_test.py DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

2
src/App/CMakeLists.txt
View File

@@ -57,7 +57,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${ZIPIOS_INCLUDES}

4
src/Base/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYCXX_INCLUDE_DIR}
@@ -65,7 +65,7 @@ list(APPEND FreeCADBase_LIBS ${QtCore_LIBRARIES})
list(APPEND FreeCADBase_LIBS fmt::fmt)
if (BUILD_DYNAMIC_LINK_PYTHON)
list(APPEND FreeCADBase_LIBS ${PYTHON_LIBRARIES})
list(APPEND FreeCADBase_LIBS ${Python3_LIBRARIES})
endif (BUILD_DYNAMIC_LINK_PYTHON)
# needed for OpenSUSE

2
src/Build/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Version.h)
add_custom_command(
OUTPUT version_file
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/Version.h
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py
COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py
--srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/Version.h.out
${CMAKE_CURRENT_BINARY_DIR}/Version.h

2
src/Doc/ThirdPartyLibraries.html.cmake
View File

@@ -157,7 +157,7 @@ Additional BSD Notice
<hr>
<h3><a name="_TocPython"></a>Python</h3>
<p>Version: ${PYTHON_VERSION_STRING}</p>
<p>Version: ${Python3_VERSION}</p>
<p>Web site: <a href="https://www.python.org/">https://www.python.org/</a></p>
<p>License: <a href="https://docs.python.org/3.6/license.html">https://docs.python.org/3.6/license.html</a></p>

6
src/Ext/freecad/CMakeLists.txt
View File

@@ -1,12 +1,12 @@
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_libs 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('purelib'))"
OUTPUT_VARIABLE python_libs OUTPUT_STRIP_TRAILING_WHITESPACE )
endif()

2
src/Gui/CMakeLists.txt
View File

@@ -60,7 +60,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/DAGView
${Boost_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${ZIPIOS_INCLUDES}

2
src/MacAppBundle/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ endif()
#
if(FREECAD_CREATE_MAC_APP)
set(PYTHON_DIR_BASENAME python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
set(PYTHON_DIR_BASENAME python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
if(PYTHON_LIBRARY MATCHES "(.*Python\\.framework).*")
#framework

8
src/Main/CMakeLists.txt
View File

@@ -10,7 +10,7 @@ if(BUILD_GUI)
${ZLIB_INCLUDE_DIR}
${QtWidgets_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
else(BUILD_GUI)
@@ -18,7 +18,7 @@ else(BUILD_GUI)
${Boost_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${QT_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
endif(BUILD_GUI)
@@ -40,7 +40,7 @@ if(BUILD_GUI)
# executables have to be linked against python libraries,
# because extension modules are not.
list(APPEND FreeCAD_LIBS
${PYTHON_LIBRARIES}
${Python3_LIBRARIES}
)
endif(NOT BUILD_DYNAMIC_LINK_PYTHON)
@@ -88,7 +88,7 @@ if(NOT BUILD_DYNAMIC_LINK_PYTHON)
# executables have to be linked against python libraries,
# because extension modules are not.
list(APPEND FreeCADMainCmd_LIBS
${PYTHON_LIBRARIES}
${Python3_LIBRARIES}
)
endif(NOT BUILD_DYNAMIC_LINK_PYTHON)

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

@@ -5,7 +5,7 @@ include_directories(
${CMAKE_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})

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

@@ -3,7 +3,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${COIN3D_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})

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()

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

@@ -5,7 +5,7 @@ endif()
include_directories(
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}

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

@@ -5,7 +5,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
)
set(CloudGui_LIBS

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

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

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

@@ -3,7 +3,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})

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

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

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

@@ -22,7 +22,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${SMESH_INCLUDE_DIR}

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

@@ -21,7 +21,7 @@ include_directories(
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${SMESH_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)

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

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

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

@@ -6,7 +6,7 @@ include_directories(
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})

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

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

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

@@ -3,7 +3,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}

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

@@ -7,7 +7,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})

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

@@ -13,7 +13,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/3rdParty/libkdtree
${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}

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

@@ -3,7 +3,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}/Inventor/annex
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}

12
src/Mod/MeshPart/App/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${SMESH_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
@@ -109,7 +109,7 @@ if (BUILD_FLAT_MESH)
add_library(flatmesh SHARED ${FLATMESH_SRCS})
SET_PYTHON_PREFIX_SUFFIX(flatmesh)
target_link_libraries(flatmesh ${PYTHON_LIBRARIES} ${MeshPart_LIBS})
target_link_libraries(flatmesh ${Python3_LIBRARIES} ${MeshPart_LIBS})
SET_BIN_DIR(flatmesh flatmesh /Mod/MeshPart)
install(TARGETS flatmesh DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -120,14 +120,14 @@ if (BUILD_FLAT_MESH)
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()
@@ -150,7 +150,7 @@ if (BUILD_FLAT_MESH)
SET_PYTHON_PREFIX_SUFFIX(flatmesh)
if (BUILD_DYNAMIC_LINK_PYTHON)
target_link_libraries(flatmesh ${PYTHON_LIBRARIES})
target_link_libraries(flatmesh ${Python3_LIBRARIES})
endif(BUILD_DYNAMIC_LINK_PYTHON)
target_link_libraries(flatmesh ${MeshPart_LIBS} ${Boost_LIBRARIES})

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

@@ -17,7 +17,7 @@ include_directories(
${OCC_INCLUDE_DIR}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
)
link_directories(${OCC_LIBRARY_DIR})

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

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

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

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

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

@@ -8,7 +8,7 @@ include_directories(
${QT_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/

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

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

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

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

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

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

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

@@ -22,7 +22,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}

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

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

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

@@ -6,7 +6,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/Robot/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}
)
link_directories(${OCC_LIBRARY_DIR})

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ endif(WIN32)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}

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

@@ -5,7 +5,7 @@ include_directories(
${COIN3D_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)

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

@@ -22,7 +22,7 @@
# ***************************************************************************/
include_directories(
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${QtCore_INCLUDE_DIRS}
${ZIPIOS_INCLUDES}
)

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

@@ -25,7 +25,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${QtCore_INCLUDE_DIRS}
${QtSvg_INCLUDE_DIRS}
${QtUiTools_INCLUDE_DIRS}

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

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

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

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

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

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

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

@@ -18,7 +18,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${ZIPIOS_INCLUDES}
${ZLIB_INCLUDE_DIR}

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

@@ -2,7 +2,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)

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

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

2
src/Tools/_TEMPLATE_/App/CMakeLists.txt
View File

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

2
src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)

16
src/Tools/embedded/Qt/cxx/CMakeLists.txt
View File

@@ -13,12 +13,12 @@ find_package(Boost COMPONENTS signals REQUIRED)
# Python
find_package(PythonInterp REQUIRED)
set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
IF (NOT DEFINED PYTHON_VERSION_STRING)
set(Python_ADDITIONAL_VERSIONS ${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
IF (NOT DEFINED Python3_VERSION)
find_package(PythonLibs REQUIRED)
ELSE (NOT DEFINED PYTHON_VERSION_STRING)
find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
ENDIF(NOT DEFINED PYTHON_VERSION_STRING)
ELSE (NOT DEFINED Python3_VERSION)
find_package(PythonLibs ${Python3_VERSION} EXACT)
ENDIF(NOT DEFINED Python3_VERSION)
# FreeCAD
set(FREECAD_SRC_DIR ${CMAKE_SOURCE_DIR}/../../../.. CACHE PATH "FreeCAD sources")
@@ -32,7 +32,7 @@ add_definitions(-DBOOST_ALL_DYN_LINK)
include_directories(
${Boost_INCLUDE_DIRS}
#${COIN3D_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${Python3_INCLUDE_DIRS}
${Qt5Core_INCLUDE_DIRS}
${Qt5Gui_INCLUDE_DIRS}
${Qt5Widgets_INCLUDE_DIRS}
@@ -52,7 +52,7 @@ set(MyPlugin_SRCS
set(MyPlugin_LIBS
${Boost_LIBRARIES}
#${COIN3D_LIBRARIES}
${PYTHON_LIBRARIES}
${Python3_LIBRARIES}
${Qt5Core_LIBRARIES}
${Qt5Gui_LIBRARIES}
${Qt5Widgets_LIBRARIES}
@@ -70,7 +70,7 @@ set(FreeCADPlugin_SRCS
set(FreeCADPlugin_LIBS
${Boost_LIBRARIES}
#${COIN3D_LIBRARIES}
${PYTHON_LIBRARIES}
${Python3_LIBRARIES}
${Qt5Core_LIBRARIES}
${Qt5Gui_LIBRARIES}
${Qt5Widgets_LIBRARIES}

4
tests/CMakeLists.txt
View File

@@ -46,7 +46,7 @@ endif(WIN32)
if(NOT BUILD_DYNAMIC_LINK_PYTHON)
list(APPEND Google_Tests_LIBS
${PYTHON_LIBRARIES}
${Python3_LIBRARIES}
)
endif()
@@ -63,7 +63,7 @@ function(setup_qt_test)
if(NOT BUILD_DYNAMIC_LINK_PYTHON)
list(APPEND ${_testname}_LIBS
${PYTHON_LIBRARIES}
${Python3_LIBRARIES}
)
endif()