diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-06-15 16:01:22 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2025-04-13 18:22:53 +0200 |
commit | 3a2bb2fcfdbe66028c1a30f9820775b05be36b03 (patch) | |
tree | 919911968881fe0920e81440ce5c2ebe4bb7cef6 /cmake/platform | |
parent | 9d945f0db0265b00bc6e28bcffd4ab5440d3a99b (diff) |
Build: Normalize executable locations in build directory for all platforms
(cherry picked from commit a7c42f1ed55e586d0d817dd99865aa7c024b0140)
Diffstat (limited to 'cmake/platform')
-rw-r--r-- | cmake/platform/unix/settings.cmake | 4 | ||||
-rw-r--r-- | cmake/platform/win/settings.cmake | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 2dd8197e293..bcd25af4903 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -46,6 +46,10 @@ if(APPLE) endif() message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}") + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/bin") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/lib") + if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake index 63c118f76e0..297b46d75ac 100644 --- a/cmake/platform/win/settings.cmake +++ b/cmake/platform/win/settings.cmake @@ -4,6 +4,9 @@ add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-DNOMINMAX) add_definitions(-DTRINITY_REQUIRED_WINDOWS_BUILD=18362) +# set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>") + if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake) elseif(CMAKE_CXX_PLATFORM_ID MATCHES "MinGW") |