mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-10 23:52:59 -04:00
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
required for 'network-sandbox'
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -7,16 +7,8 @@
|
|
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets)
|
|
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets REQUIRED)
|
|
|
|
-include(FetchContent)
|
|
-FetchContent_Declare(
|
|
- inih
|
|
- GIT_REPOSITORY https://github.com/benhoyt/inih.git
|
|
- GIT_TAG r44
|
|
-)
|
|
-FetchContent_GetProperties(inih)
|
|
-if (NOT inih_POPULATED)
|
|
- FetchContent_MakeAvailable(inih)
|
|
-endif()
|
|
+find_package(PkgConfig REQUIRED)
|
|
+pkg_check_modules(INIH REQUIRED inih)
|
|
|
|
add_executable(
|
|
zdl
|
|
@@ -46,9 +38,9 @@
|
|
libwad.cpp
|
|
qzdl.cpp
|
|
${PROJECT_SOURCE_DIR}/zdlconf/zdlconf.cpp
|
|
- ${inih_SOURCE_DIR}/ini.c
|
|
)
|
|
|
|
target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf)
|
|
-target_include_directories(zdl PRIVATE ${inih_SOURCE_DIR})
|
|
-target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets)
|
|
+target_include_directories(zdl PRIVATE ${INIH_INCLUDE_DIRS})
|
|
+target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets ${INIH_LIBRARIES})
|
|
+target_compile_options(zdl PRIVATE ${INIH_CFLAGS_OTHER})
|