Ensure `use_package` is defined when configuring capslock detection
This commit is contained in:
parent
d47a5a93ed
commit
91b9eed2d0
|
@ -116,10 +116,24 @@ set(SCRIPT_FILES scripts/required_icons.sh)
|
||||||
# required to include CMake modules from own project directory
|
# required to include CMake modules from own project directory
|
||||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_MODULE_PATH}")
|
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_MODULE_PATH}")
|
||||||
|
|
||||||
|
# find c++utilities
|
||||||
|
set(CONFIGURATION_PACKAGE_SUFFIX
|
||||||
|
""
|
||||||
|
CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
|
||||||
|
set(PACKAGE_NAMESPACE
|
||||||
|
""
|
||||||
|
CACHE STRING "sets the namespace (prefix) for find_package() calls to packages configured via c++utilities")
|
||||||
|
if (PACKAGE_NAMESPACE)
|
||||||
|
set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-")
|
||||||
|
endif ()
|
||||||
|
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.5.0 REQUIRED)
|
||||||
|
use_cpp_utilities()
|
||||||
|
|
||||||
# configure platform specific capslock detection for enterpassworddialog.cpp
|
# configure platform specific capslock detection for enterpassworddialog.cpp
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(HAVE_PLATFORM_SPECIFIC_CAPSLOCK_DETECTION ON)
|
set(HAVE_PLATFORM_SPECIFIC_CAPSLOCK_DETECTION ON)
|
||||||
else ()
|
else ()
|
||||||
|
include(3rdParty)
|
||||||
use_package(TARGET_NAME X11::X11 PACKAGE_NAME X11)
|
use_package(TARGET_NAME X11::X11 PACKAGE_NAME X11)
|
||||||
if (TARGET X11::X11)
|
if (TARGET X11::X11)
|
||||||
set_property(
|
set_property(
|
||||||
|
@ -162,19 +176,6 @@ else ()
|
||||||
message(STATUS "D-Bus notifications disabled")
|
message(STATUS "D-Bus notifications disabled")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# find c++utilities
|
|
||||||
set(CONFIGURATION_PACKAGE_SUFFIX
|
|
||||||
""
|
|
||||||
CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
|
|
||||||
set(PACKAGE_NAMESPACE
|
|
||||||
""
|
|
||||||
CACHE STRING "sets the namespace (prefix) for find_package() calls to packages configured via c++utilities")
|
|
||||||
if (PACKAGE_NAMESPACE)
|
|
||||||
set(PACKAGE_NAMESPACE_PREFIX "${PACKAGE_NAMESPACE}-")
|
|
||||||
endif ()
|
|
||||||
find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.5.0 REQUIRED)
|
|
||||||
use_cpp_utilities()
|
|
||||||
|
|
||||||
# include modules to apply configuration
|
# include modules to apply configuration
|
||||||
include(BasicConfig)
|
include(BasicConfig)
|
||||||
include(QtGuiConfig)
|
include(QtGuiConfig)
|
||||||
|
|
Loading…
Reference in New Issue