From b967a11ffd79b946fd3c9f5bc3a824a817873f0c Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:56:27 +0200 Subject: [PATCH] Make switching source directories easier Engine src dir can now be switched with 1 var in CMake. --- CMakeLists.txt | 8 +++++--- r5dev/cmake/Configure.cmake | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 263b21c3..50b8e39a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,11 @@ cmake_minimum_required( VERSION 3.16 ) project( r5sdk ) -include( "r5dev/cmake/Configure.cmake" ) -include( "r5dev/cmake/Macros.cmake" ) -include( "r5dev/cmake/Options.cmake" ) +set( ENGINE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/r5dev" CACHE PATH "Engine source directory" ) + +include( "${ENGINE_SOURCE_DIR}/cmake/Configure.cmake" ) +include( "${ENGINE_SOURCE_DIR}/cmake/Macros.cmake" ) +include( "${ENGINE_SOURCE_DIR}/cmake/Options.cmake" ) initial_setup() setup_build_configurations() diff --git a/r5dev/cmake/Configure.cmake b/r5dev/cmake/Configure.cmake index c75eac30..b6ff37a9 100644 --- a/r5dev/cmake/Configure.cmake +++ b/r5dev/cmake/Configure.cmake @@ -5,9 +5,7 @@ macro( initial_setup ) set( CMAKE_CXX_STANDARD 17 ) set( CMAKE_CXX_STANDARD_REQUIRED True ) - set( ENGINE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/r5dev" CACHE PATH "Engine source directory" ) set( THIRDPARTY_SOURCE_DIR "${ENGINE_SOURCE_DIR}/thirdparty" CACHE PATH "Thirdparty source directory" ) - set( BUILD_OUTPUT_DIR "game" CACHE PATH "Build output directory" ) set( GLOBAL_PCH