|
21 | 21 | # |
22 | 22 |
|
23 | 23 | # This is the root Teem CMakeLists file |
24 | | -cmake_minimum_required(VERSION 2.4) |
| 24 | +cmake_minimum_required(VERSION 3.10.2) |
25 | 25 |
|
26 | 26 |
|
27 | 27 | # Remove PNG support, as teem uses deprecated libpng calls |
@@ -60,8 +60,8 @@ include (CMakeBackwardCompatibilityC) |
60 | 60 |
|
61 | 61 | #----------------------------------------------------------------------------- |
62 | 62 | # 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.") |
65 | 65 | #output directory for installing all include files.") |
66 | 66 | mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) |
67 | 67 | set(Teem_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}") |
@@ -279,16 +279,16 @@ foreach(header_file ${Teem_HEADER_FILES}) |
279 | 279 | #message(STATUS "Copy header file: ${header_file}") |
280 | 280 | get_filename_component(file_no_path "${header_file}" NAME) |
281 | 281 | 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) |
283 | 283 | set(Teem_INSTALLED_HEADER_FILES |
284 | 284 | ${Teem_INSTALLED_HEADER_FILES} |
285 | | - "${CMAKE_BINARY_DIR}/include/teem/${file_no_path}") |
| 285 | + "${CLEAVER2_BINARY_DIR}/include/teem/${file_no_path}") |
286 | 286 | endforeach() |
287 | 287 |
|
288 | 288 | #--- |
289 | 289 | # Include directory |
290 | 290 | include_directories( |
291 | | - "${CMAKE_BINARY_DIR}/include/" |
| 291 | + "${CLEAVER2_BINARY_DIR}/include/" |
292 | 292 | "${Teem_SOURCE_DIR}/include/" |
293 | 293 | ) |
294 | 294 |
|
|
0 commit comments