Skip to content

Commit dd398f4

Browse files
Merge pull request #2850 from google-deepmind:cmake
PiperOrigin-RevId: 807207617 Change-Id: I3e54ea0c79560bcf283b16ee9ee5772ae8e99a8c
2 parents 4fc69fa + 155d6c6 commit dd398f4

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
cmake_minimum_required(VERSION 3.16)
15+
set(MUJOCO_CMAKE_MIN_REQ "3.16")
16+
cmake_minimum_required(VERSION ${MUJOCO_CMAKE_MIN_REQ})
1617

1718
# Make CMAKE_C_VISIBILITY_PRESET work properly.
1819
set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)

cmake/MujocoDependencies.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@ findorfetch(
168168
target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
169169
target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
170170

171+
# update cmake_minimum_required version for compatibility with newer version of cmake
172+
if(NOT DEFINED CMAKE_POLICY_VERSION_MINIMUM)
173+
set(CMAKE_POLICY_VERSION_MINIMUM ${MUJOCO_CMAKE_MIN_REQ})
174+
set(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED ON)
175+
endif()
171176
findorfetch(
172177
USE_SYSTEM_PACKAGE
173178
OFF
@@ -183,6 +188,10 @@ findorfetch(
183188
tinyobjloader
184189
EXCLUDE_FROM_ALL
185190
)
191+
if(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
192+
unset(CMAKE_POLICY_VERSION_MINIMUM)
193+
unset(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
194+
endif()
186195

187196
if(NOT TARGET trianglemeshdistance)
188197
FetchContent_Declare(
@@ -200,6 +209,11 @@ endif()
200209

201210
set(ENABLE_DOUBLE_PRECISION ON)
202211
set(CCD_HIDE_ALL_SYMBOLS ON)
212+
# update cmake_minimum_required version for compatibility with newer version of cmake
213+
if(NOT DEFINED CMAKE_POLICY_VERSION_MINIMUM)
214+
set(CMAKE_POLICY_VERSION_MINIMUM ${MUJOCO_CMAKE_MIN_REQ})
215+
set(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED ON)
216+
endif()
203217
findorfetch(
204218
USE_SYSTEM_PACKAGE
205219
OFF
@@ -215,6 +229,10 @@ findorfetch(
215229
ccd
216230
EXCLUDE_FROM_ALL
217231
)
232+
if(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
233+
unset(CMAKE_POLICY_VERSION_MINIMUM)
234+
unset(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
235+
endif()
218236
target_compile_options(ccd PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
219237
target_link_options(ccd PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
220238

0 commit comments

Comments
 (0)