WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 61f412c

Browse files
authored
Update cmake_minimum_required to 3.12 (#3525)
Recent CMake-4 threats projects with cmake_minimum_required < 3.10 failure and refuses to configure them. Updating minimal requirement to 3.12 and simplify some parts of project that depends on older version compatibility. Signed-off-by: Azamat H. Hackimov <[email protected]>
1 parent c29ee74 commit 61f412c

File tree

3 files changed

+6
-37
lines changed

3 files changed

+6
-37
lines changed

CMakeLists.txt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
2-
3-
if(POLICY CMP0074)
4-
cmake_policy(SET CMP0074 NEW)
5-
endif()
1+
cmake_minimum_required(VERSION 3.12)
62

73
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
84
include(DisallowInSource)
@@ -97,14 +93,8 @@ set(QT_PREFIX "Qt${CUTTER_QT}")
9793
find_package(${QT_PREFIX} REQUIRED COMPONENTS ${QT_COMPONENTS})
9894

9995
if(CUTTER_ENABLE_PYTHON)
100-
if(CMAKE_VERSION VERSION_LESS "3.12.0")
101-
find_package(PythonInterp REQUIRED)
102-
find_package(PythonLibs ${CUTTER_PYTHON_MIN} REQUIRED)
103-
include_directories(${PYTHON_INCLUDE_DIRS})
104-
else()
105-
find_package (Python3 ${CUTTER_PYTHON_MIN} REQUIRED COMPONENTS Interpreter Development)
106-
set (PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
107-
endif()
96+
find_package (Python3 ${CUTTER_PYTHON_MIN} REQUIRED COMPONENTS Interpreter Development)
97+
set (PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
10898

10999
add_definitions(-DCUTTER_ENABLE_PYTHON)
110100

dist/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,8 @@ if(WIN32)
1414
if (CUTTER_ENABLE_DEPENDENCY_DOWNLOADS)
1515
set(CPACK_INSTALL_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/WindowsBundlePython.cmake)
1616
endif()
17-
if(CMAKE_VERSION VERSION_LESS "3.12.0")
18-
find_package(PythonInterp REQUIRED)
19-
install(DIRECTORY ${CUTTER_DEPS}/pyside/lib/site-packages DESTINATION "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
20-
else()
21-
find_package (Python3 ${CUTTER_PYTHON_MIN} REQUIRED COMPONENTS)
22-
install(DIRECTORY ${CUTTER_DEPS}/pyside/lib/site-packages DESTINATION "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
23-
endif()
17+
find_package (Python3 ${CUTTER_PYTHON_MIN} REQUIRED COMPONENTS)
18+
install(DIRECTORY ${CUTTER_DEPS}/pyside/lib/site-packages DESTINATION "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
2419
install(FILES ${CUTTER_DEPS}/pyside/bin/shiboken6.abi3.dll ${CUTTER_DEPS}/pyside/bin/pyside6.abi3.dll DESTINATION .)
2520
endif()
2621
install(SCRIPT WindowsBundleQt.cmake)

src/CMakeLists.txt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -510,23 +510,7 @@ endif()
510510

511511
target_link_libraries(Cutter PUBLIC ${RIZIN_TARGET})
512512
if(CUTTER_ENABLE_PYTHON)
513-
if(CMAKE_VERSION VERSION_LESS "3.12.0")
514-
# On windows some of the Python STABLE API functions are in seperate library
515-
# which isn't added by CMake.
516-
if (WIN32)
517-
foreach(_PYTHON_LIBRARY ${PYTHON_LIBRARIES})
518-
# Skip extra "optimized" and "debug" values that are only meant for passing to target_link_libraries()
519-
if((NOT _PYTHON_LIBRARY STREQUAL "optimized") AND (NOT _PYTHON_LIBRARY STREQUAL "debug"))
520-
get_filename_component(_PYTHON_LIB_DIR ${_PYTHON_LIBRARY} DIRECTORY)
521-
message(STATUS "Add extra library dir for Python: ${_PYTHON_LIB_DIR}")
522-
target_link_directories(Cutter PRIVATE ${_PYTHON_LIB_DIR})
523-
endif()
524-
endforeach()
525-
endif()
526-
target_link_libraries(Cutter PRIVATE ${PYTHON_LIBRARIES})
527-
else()
528-
target_link_libraries(Cutter PRIVATE Python3::Python)
529-
endif()
513+
target_link_libraries(Cutter PRIVATE Python3::Python)
530514

531515
if(CUTTER_ENABLE_PYTHON_BINDINGS)
532516
target_link_libraries(Cutter PRIVATE ${CUTTER_PYSIDE_LIBS})

0 commit comments

Comments
 (0)