From 1e8ff50d59f1e8515dd9b017f23cb2a0b3b13f8e Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 1 Dec 2024 18:52:59 -0500 Subject: [PATCH] refactor: mv cmake policy settings to main CMakelists.txt --- CMakeLists.txt | 9 ++++++++- cmake/Definitions.cmake | 8 -------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aa1a9055..7aeb3c125 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,12 @@ # > See https://reproducible-builds.org/specs/source-date-epoch/ for details. 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(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_EXTENSIONS OFF) @@ -90,9 +96,10 @@ if(APPLE) endif() # 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_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") +set(BIN_TEMP_DIR ${PROJECT_BINARY_DIR}/temp/bin) include(cmake/Definitions.cmake) include(cmake/Build.cmake) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index edd6173eb..8f2c76dcb 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -26,14 +26,6 @@ macro(configure_definitions) add_definitions(-DNDEBUG) 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() macro(configure_options)