From d327bc5b822fd9b953a8f5ce019490c0a5ca4fb9 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 29 May 2025 00:15:27 -0300 Subject: [PATCH] [cmake] Put binaries into the root build folder. Follow up 936b887659b5ae19fbb1c40dfee3a25c021b82f0 Signed-off-by: Viktor Govako --- CMakeLists.txt | 3 +++ cmake/OmimConfig.cmake | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac3f9c77a..b48a77176 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,9 @@ endif() set(OMIM_ROOT ${CMAKE_SOURCE_DIR}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OMIM_ROOT}/cmake") +set(CMAKE_POSITION_INDEPENDENT_CODE ON) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + include(OmimPlatform) include(OmimOptions) include(OmimConfig) diff --git a/cmake/OmimConfig.cmake b/cmake/OmimConfig.cmake index 0bcef5f0e..a24d126e5 100644 --- a/cmake/OmimConfig.cmake +++ b/cmake/OmimConfig.cmake @@ -7,8 +7,6 @@ set(3PARTY_INCLUDE_DIRS "${OMIM_ROOT}/3party/boost") set(OMIM_DATA_DIR "${OMIM_ROOT}/data") set(OMIM_USER_RESOURCES_DIR "${OMIM_ROOT}/data") -set(CMAKE_POSITION_INDEPENDENT_CODE ON) - # GCC 10.0 is required to support header inclusion in base/string_utils.hpp if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) message(FATAL_ERROR "Minimum supported g++ version is 10.0, yours is ${CMAKE_CXX_COMPILER_VERSION}")