Skip to content

Commit

Permalink
Don't use vendored dependencies in "dev-tools" (by default) if RTTR_U…
Browse files Browse the repository at this point in the history
…SE_SYSTEM_LIBS is set

We should honor this variable also for the vendored dependencies in dev-tools
  • Loading branch information
Flamefire authored Dec 30, 2024
1 parent 938c7f2 commit cebaf36
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
# Copyright (C) 2005 - 2021 Settlers Freaks <sf-team at siedler25.org>
# Copyright (C) 2005 - 2024 Settlers Freaks <sf-team at siedler25.org>
#
# SPDX-License-Identifier: GPL-2.0-or-later

include(RttrTestingCfg)
option(RTTR_EXTERNAL_BUILD_TESTING "Enable tests of external dependencies" OFF)
set(BUILD_TESTING ${RTTR_EXTERNAL_BUILD_TESTING})

if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/dev-tools/CMakeLists.txt)
set(devToolsExist ON)
if(NOT RTTR_USE_SYSTEM_LIBS AND EXISTS ${CMAKE_CURRENT_LIST_DIR}/dev-tools/CMakeLists.txt)
set(includeDevToolsDefault ON)
else()
set(devToolsExist OFF)
set(includeDevToolsDefault OFF)
endif()
option(RTTR_INCLUDE_DEVTOOLS "Include folder with precompiled binaries for development" ${devToolsExist})

option(RTTR_INCLUDE_DEVTOOLS "Include folder with precompiled binaries for development" ${includeDevToolsDefault})
if(RTTR_INCLUDE_DEVTOOLS)
add_subdirectory(dev-tools)
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
Expand Down

0 comments on commit cebaf36

Please sign in to comment.