Skip to content

Commit ed3a99e

Browse files
committed
Find Qt::GuiPrivate package
According to the PR below, NixOS requires to have find Qt::GuiPrivate package intentionally. - norihiro/obs-color-monitor#124 In addition, this commit includes these related changes. - Call `find_package` even inside another directory - Require Qt::GuiPrivate only for Linux
1 parent 130514f commit ed3a99e

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,20 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
88
set(CMAKE_AUTOMOC ON)
99
set(CMAKE_AUTOUIC ON)
1010

11-
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
11+
if(NOT TARGET OBS::libobs)
1212
find_package(libobs REQUIRED)
13+
endif()
14+
if(NOT TARGET OBS::frontend-api)
1315
find_package(obs-frontend-api REQUIRED)
1416
add_library(OBS::frontend-api ALIAS OBS::obs-frontend-api)
15-
find_package(Qt6 REQUIRED COMPONENTS Widgets Gui)
17+
endif()
18+
find_package(Qt6 REQUIRED COMPONENTS Widgets Gui)
19+
if(UNIX AND NOT APPLE)
20+
# NixOS requires to find GuiPrivate.
21+
find_package(Qt6 QUIET COMPONENTS GuiPrivate)
22+
endif()
1623

24+
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
1725
add_library(${PROJECT_NAME})
1826

1927
target_compile_definitions(${PROJECT_NAME} PRIVATE NORISCOMMONUI_LIBRARY)
@@ -56,10 +64,10 @@ target_link_libraries(${PROJECT_NAME}
5664
OBS::libobs
5765
OBS::frontend-api
5866
Qt::Widgets
59-
Qt::GuiPrivate
6067
)
6168

6269
if(UNIX AND NOT APPLE)
6370
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
6471
target_link_options(${PROJECT_NAME} PRIVATE -Wl,-z,defs)
72+
target_link_libraries(${PROJECT_NAME} Qt::GuiPrivate)
6573
endif()

0 commit comments

Comments
 (0)