diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-15 16:01:22 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-06-20 01:21:24 +0200 |
| commit | 063551a65f73936c589e6dcdb3e8652e6f56c739 (patch) | |
| tree | cea30aebe49060d52d2e618eeed4677d3922b779 /cmake/platform | |
| parent | b7c0028bf5672aec2dad6146c986e4efb48fddb3 (diff) | |
Build: Normalize executable locations in build directory for all platforms
(cherry picked from commit a7c42f1ed55e586d0d817dd99865aa7c024b0140)
# Conflicts:
# .github/workflows/win-x64-build.yml
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") |