diff options
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c84031cd..3d6eba06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,10 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_SKIP_INSTALL_RPATH FALSE) set(CMAKE_SKIP_RPATH FALSE) +if(NOT GENERATOR_IS_MULTI_CONFIG) + string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE) +endif() + set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) set(CMAKE_POLICY_DEFAULT_CMP0068 NEW) @@ -37,10 +41,10 @@ if(CMAKE_INSTALL_PREFIX STREQUAL "" OR CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAU endif() if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY AND NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY AND NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/bin" CACHE INTERNAL "" FORCE) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/lib" CACHE INTERNAL "" FORCE) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/lib" CACHE INTERNAL "" FORCE) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/lib") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/lib") endif() +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/bin") if(NOT GENERATOR_IS_MULTI_CONFIG) if(CMAKE_BUILD_TYPE STREQUAL "") @@ -64,11 +68,6 @@ function(sets type) endwhile() endfunction() -if(NOT GENERATOR_IS_MULTI_CONFIG) -string(TOUPPER "${CMAKE_BUILD_TYPE}" __fm_uppercase_CMAKE_BUILD_TYPE) -sets(STRING CMAKE_BUILD_TYPE "${__fm_uppercase_CMAKE_BUILD_TYPE}") -endif() - macro(fm_run_hook str) if(COMMAND "${str}") cmake_language(CALL "${str}") diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 578a05d0..b547a08c 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -3,11 +3,13 @@ project(floormat-external) if(NOT DEFINED FLOORMAT_SUBMODULE-SDL2) find_package(SDL2 QUIET) if(SDL2_FOUND) - set(FLOORMAT_SUBMODULE-SDL2 OFF CACHE BOOL "SDL2 as submodule") + set(FLOORMAT_SUBMODULE-SDL2 OFF CACHE BOOL + "SDL2 as submodule") endif() endif() -set(FLOORMAT_SUBMODULE-SDL2 ON CACHE BOOL "SDL2 as submodule") +set(FLOORMAT_SUBMODULE-SDL2 ON CACHE BOOL + "SDL2 as submodule") set(FLOORMAT_SUBMODULE-DEPENDENCIES ON CACHE BOOL "Use dependencies included in the source directory (needs git submodule update --init).") |