From 39a2e4306f560fd99455bad028c15aa43bdb2f68 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Mon, 2 Feb 2026 00:58:36 +0100 Subject: [PATCH 1/4] Update CMake minimum version to 3.10 Fix cmake deprecation Cmake version < then 3.10 is deprecated --- CMakeLists.txt | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7a58e6d67..4dc635487f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) cmake_policy(SET CMP0017 NEW) #this line has to appear before 'PROJECT' in order to be able to disable incremental linking @@ -90,7 +90,6 @@ IF(MSVC) SET(CMAKE_EXTRA_LINK_FLAGS ${replacementFlag3}) - STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags3 "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}") SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3}) SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags3}" ) @@ -166,8 +165,6 @@ IF(MSVC) OPTION(USE_MSVC_EXEPTIONS "Use MSVC C++ exceptions option" OFF) - - OPTION(USE_MSVC_COMDAT_FOLDING "Use MSVC /OPT:ICF COMDAT folding option" ON) IF(USE_MSVC_COMDAT_FOLDING) @@ -186,7 +183,6 @@ IF(MSVC) ENDIF(MSVC) - IF (WIN32) OPTION(INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES "Create MSVC projectfiles that can be distributed" OFF) @@ -202,7 +198,6 @@ ELSE() ENDIF() - OPTION(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES "Create MSVC projectfiles with relative paths" OFF) OPTION(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES "Add MSVC postfix for executable names (_Debug)" OFF) @@ -211,9 +206,6 @@ SET(CMAKE_MINSIZEREL_POSTFIX "_MinsizeRel" CACHE STRING "Adds a postfix for Mins SET(CMAKE_RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo" CACHE STRING "Adds a postfix for ReleaseWithDebug-built libraries.") - - - IF (INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES) SET(CMAKE_SUPPRESS_REGENERATION 1) SET(CMAKE_USE_RELATIVE_PATHS 1) @@ -224,8 +216,6 @@ ENDIF (WIN32) OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU examples" ON) - - OPTION(INTERNAL_UPDATE_SERIALIZATION_STRUCTURES "Internal update serialization structures" OFF) IF (INTERNAL_UPDATE_SERIALIZATION_STRUCTURES) ADD_DEFINITIONS( -DBT_INTERNAL_UPDATE_SERIALIZATION_STRUCTURES) @@ -295,9 +285,8 @@ IF (USE_GLUT AND MSVC) ENDIF() - ELSE(WIN32) -OPTION(USE_GLUT "Use Glut" ON) + OPTION(USE_GLUT "Use Glut" ON) ENDIF(WIN32) @@ -436,14 +425,12 @@ IF(BUILD_BULLET2_DEMOS) ENDIF(BUILD_BULLET2_DEMOS) - OPTION(BUILD_EXTRAS "Set when you want to build the extras" ON) IF(BUILD_EXTRAS) SUBDIRS(Extras) ENDIF(BUILD_EXTRAS) - SUBDIRS(src) IF("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles") From 3c978ed709860dea51310f95369ca659d51d3cf1 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Fri, 4 Sep 2026 10:42:22 +0200 Subject: [PATCH 2/4] Remove deprecated CMP0003 policy setting Removed deprecated cmake_policy setting for CMP0003. --- CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dc635487f..b42679200a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ PROJECT(BULLET_PHYSICS) FILE (STRINGS "VERSION" BULLET_VERSION) IF(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) if(POLICY CMP0042) # Enable MACOSX_RPATH by default. cmake_policy(SET CMP0042 NEW) @@ -290,11 +289,6 @@ ELSE(WIN32) ENDIF(WIN32) -IF(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -ENDIF(COMMAND cmake_policy) - - # This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system # This should be the case. From bc8a4736653e6baf28b2074a88c95ef99012bbd4 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Fri, 4 Sep 2026 10:44:31 +0200 Subject: [PATCH 3/4] Refactor INSTALL logic for Apple frameworks --- src/CMakeLists.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c30125c539..1a12d80529 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,12 +8,9 @@ SUBDIRS( BulletInverseDynamics BulletSoftBody BulletCollision BulletDynamics L IF(INSTALL_LIBS) - #INSTALL of other files requires CMake 2.6 - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - # Don't actually need to install any common files, the frameworks include everything - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h DESTINATION ${INCLUDE_INSTALL_DIR}) - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + # Don't actually need to install any common files, the frameworks include everything + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h DESTINATION ${INCLUDE_INSTALL_DIR}) + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF(INSTALL_LIBS) From a5be7c3951042ce8eea0f345f4f8722ddc572338 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Fri, 4 Sep 2026 10:45:19 +0200 Subject: [PATCH 4/4] Update CMakeLists.txt for minimum version and policies Updated CMake minimum version and removed policy setting. --- Extras/Serialize/makesdna/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Extras/Serialize/makesdna/CMakeLists.txt b/Extras/Serialize/makesdna/CMakeLists.txt index 3157b0ff41..5ab4f31d39 100644 --- a/Extras/Serialize/makesdna/CMakeLists.txt +++ b/Extras/Serialize/makesdna/CMakeLists.txt @@ -1,8 +1,4 @@ -cmake_minimum_required(VERSION 2.4) - -IF(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -ENDIF(COMMAND cmake_policy) +cmake_minimum_required(VERSION 3.10) INCLUDE_DIRECTORIES(${BULLET_PHYSICS_SOURCE_DIR}/src )