Skip to content

Commit

Permalink
[cmake] Fixed regression with QtCreator.
Browse files Browse the repository at this point in the history
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
  • Loading branch information
vng committed Jul 2, 2023
1 parent f6664ef commit 5ccd49d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 0 additions & 5 deletions 3party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
# Add gflags library.
add_subdirectory(gflags)
target_compile_options(gflags_nothreads_static PRIVATE $<$<CXX_COMPILER_ID:GNU>:-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)
Expand Down
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5ccd49d

Please sign in to comment.