refactor: mv cmake policy settings to main CMakelists.txt
This commit is contained in:
parent
5d591e3518
commit
1e8ff50d59
2 changed files with 8 additions and 9 deletions
|
|
@ -21,6 +21,12 @@
|
||||||
# > See https://reproducible-builds.org/specs/source-date-epoch/ for details.
|
# > See https://reproducible-builds.org/specs/source-date-epoch/ for details.
|
||||||
cmake_minimum_required(VERSION 3.24)
|
cmake_minimum_required(VERSION 3.24)
|
||||||
|
|
||||||
|
# Link items by fill path
|
||||||
|
cmake_policy(SET CMP0003 NEW)
|
||||||
|
|
||||||
|
# Fix define escaping
|
||||||
|
cmake_policy(SET CMP0005 NEW)
|
||||||
|
|
||||||
# Set CXX Requirements
|
# Set CXX Requirements
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
@ -90,9 +96,10 @@ if(APPLE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Set Output Folders
|
# Set Output Folders
|
||||||
# TODO Remove when new wix packages are made with cpack
|
# TODO Remove when new wix packages are made with cpack and not using post_config macros
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
|
||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
|
||||||
|
set(BIN_TEMP_DIR ${PROJECT_BINARY_DIR}/temp/bin)
|
||||||
|
|
||||||
include(cmake/Definitions.cmake)
|
include(cmake/Definitions.cmake)
|
||||||
include(cmake/Build.cmake)
|
include(cmake/Build.cmake)
|
||||||
|
|
|
||||||
|
|
@ -26,14 +26,6 @@ macro(configure_definitions)
|
||||||
add_definitions(-DNDEBUG)
|
add_definitions(-DNDEBUG)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# TODO: find out why we need these, and remove them if we don't.
|
|
||||||
if(COMMAND cmake_policy)
|
|
||||||
cmake_policy(SET CMP0003 NEW)
|
|
||||||
cmake_policy(SET CMP0005 NEW)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(BIN_TEMP_DIR ${PROJECT_BINARY_DIR}/temp/bin)
|
|
||||||
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(configure_options)
|
macro(configure_options)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue