From 5ccd49dc697e910971d3a8acc4dfcfea361e2e03 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Fri, 23 Jun 2023 22:56:34 -0300 Subject: [PATCH] [cmake] Fixed regression with QtCreator. Signed-off-by: Viktor Govako --- 3party/CMakeLists.txt | 5 ----- CMakeLists.txt | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt index df556b1035..2fabf1fd70 100644 --- a/3party/CMakeLists.txt +++ b/3party/CMakeLists.txt @@ -24,11 +24,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) # Add gflags library. add_subdirectory(gflags) target_compile_options(gflags_nothreads_static PRIVATE $<$:-Wno-subobject-linkage>) - # Not needed for the usual build process, but it fixes QtCreator editor, - # that doesn't see gflags/gflags.h in binary dir (gflags has tricky cmake configuration). - if (PLATFORM_DESKTOP) - include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include") - endif() # Add pugixml library. add_subdirectory(pugixml) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67608fc50c..0ef38488c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,6 +286,12 @@ endif() # Include 3party dependencies. add_subdirectory(3party) +# Not needed for the usual build process, but it fixes QtCreator editor, +# that doesn't see gflags/gflags.h in binary dir (gflags has tricky cmake configuration). +if (PLATFORM_DESKTOP) + include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include") +endif() + if (LINUX_DETECTED) find_package(ICU COMPONENTS uc i18n data REQUIRED) find_package(Freetype REQUIRED)