Skip to content

Commit a65d048

Browse files
committed
COMP: Bump vendored teem cmake_minimum_required to 3.10.2
The vendored teem copy used cmake_minimum_required(VERSION 2.4), which CMake >= 4.0 rejects. Bump to 3.10.2 to match the rest of the project. Note: the upstream teem (github.com/mhalle/teem) now requires CMake 3.25; this is a conservative bump for the vendored copy.
1 parent 395a846 commit a65d048

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/lib/teem/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#
2222

2323
# This is the root Teem CMakeLists file
24-
cmake_minimum_required(VERSION 2.4)
24+
cmake_minimum_required(VERSION 3.10.2)
2525

2626

2727
# Remove PNG support, as teem uses deprecated libpng calls
@@ -60,8 +60,8 @@ include (CMakeBackwardCompatibilityC)
6060

6161
#-----------------------------------------------------------------------------
6262
# Output directories.
63-
set (LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building all libraries.")
64-
set (EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.")
63+
# set (LIBRARY_OUTPUT_PATH ${CLEAVER2_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building all libraries.")
64+
# set (EXECUTABLE_OUTPUT_PATH ${CLEAVER2_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.")
6565
#output directory for installing all include files.")
6666
mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
6767
set(Teem_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}")
@@ -279,16 +279,16 @@ foreach(header_file ${Teem_HEADER_FILES})
279279
#message(STATUS "Copy header file: ${header_file}")
280280
get_filename_component(file_no_path "${header_file}" NAME)
281281
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/${header_file}"
282-
"${CMAKE_BINARY_DIR}/include/teem/${file_no_path}" COPYONLY IMMEDIATE)
282+
"${CLEAVER2_BINARY_DIR}/include/teem/${file_no_path}" COPYONLY IMMEDIATE)
283283
set(Teem_INSTALLED_HEADER_FILES
284284
${Teem_INSTALLED_HEADER_FILES}
285-
"${CMAKE_BINARY_DIR}/include/teem/${file_no_path}")
285+
"${CLEAVER2_BINARY_DIR}/include/teem/${file_no_path}")
286286
endforeach()
287287

288288
#---
289289
# Include directory
290290
include_directories(
291-
"${CMAKE_BINARY_DIR}/include/"
291+
"${CLEAVER2_BINARY_DIR}/include/"
292292
"${Teem_SOURCE_DIR}/include/"
293293
)
294294

src/lib/teem/UseTeemCMakeDemo/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project (TeemSampleProject)
22

3-
cmake_minimum_required(VERSION 2.4)
3+
cmake_minimum_required(VERSION 3.10.2)
44

55
if(COMMAND cmake_policy)
66
cmake_policy(SET CMP0003 NEW)

0 commit comments

Comments
 (0)