From 57f6248b6aebd7bc8195907682fc602606aa9c3c Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 1 Dec 2024 18:36:48 -0500 Subject: [PATCH] build: rm configure_build macro set items in main CMakeLists.txt --- CMakeLists.txt | 6 +++++- cmake/Build.cmake | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e29251c76..0aa1a9055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,11 @@ if(APPLE) set(CMAKE_OSX_DEPLOYMENT_TARGET 12) endif() +# Set Output Folders +# TODO Remove when new wix packages are made with cpack +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") + include(cmake/Definitions.cmake) include(cmake/Build.cmake) include(cmake/Libraries.cmake) @@ -97,7 +102,6 @@ include(cmake/Packaging.cmake) include(GNUInstallDirs) configure_definitions() -configure_build() configure_libs() add_subdirectory(doc) diff --git a/cmake/Build.cmake b/cmake/Build.cmake index b705554d5..358e6e008 100644 --- a/cmake/Build.cmake +++ b/cmake/Build.cmake @@ -13,11 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -macro(configure_build) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") -endmacro() - macro(post_config) # Build to a temp bin dir on Windows and then copy to the final bin dir