summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-06-22 21:50:30 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-06-22 21:50:30 -0500
commitc7a38e3e9ab868526b2953d3094c4be8da5ed97c (patch)
tree60354674d146172fc08fe5616a36ecfb137afe34
parent251ea4440f39b078796fb0bb8249f295a23054af (diff)
downloadhorizon-c7a38e3e9ab868526b2953d3094c4be8da5ed97c.tar.gz
horizon-c7a38e3e9ab868526b2953d3094c4be8da5ed97c.tar.bz2
horizon-c7a38e3e9ab868526b2953d3094c4be8da5ed97c.tar.xz
horizon-c7a38e3e9ab868526b2953d3094c4be8da5ed97c.zip
CMake: Ensure BCNM is only searched for in UI mode
-rw-r--r--CMakeLists.txt5
-rw-r--r--ui/qt5/CMakeLists.txt5
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d935ac..9e0e8c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,11 +74,6 @@ IF(INSTALL)
pkg_check_modules(BLKID REQUIRED blkid)
pkg_check_modules(LIBUDEV REQUIRED libudev)
pkg_check_modules(PARTED REQUIRED libparted)
- find_library(SKARNET NAMES skarnet)
- find_library(BCNM NAMES wpactrl PATH_SUFFIXES bcnm)
- if(BCNM STREQUAL "BCNM-NOTFOUND")
- message(FATAL_ERROR "BCNM is required for the Installation Environment.")
- endif()
set(BUILD_SHARED_LIBS ON)
option(BUILD_IMAGE "Enable building the image creation tools" ON)
diff --git a/ui/qt5/CMakeLists.txt b/ui/qt5/CMakeLists.txt
index 87f4d64..a138f07 100644
--- a/ui/qt5/CMakeLists.txt
+++ b/ui/qt5/CMakeLists.txt
@@ -78,6 +78,11 @@ IF(INSTALL)
pkg_check_modules(XKBFile REQUIRED xkbfile)
pkg_check_modules(LIBX11 REQUIRED x11)
pkg_check_modules(LibCap REQUIRED libcap)
+ find_library(SKARNET NAMES skarnet)
+ find_library(BCNM NAMES wpactrl PATH_SUFFIXES bcnm)
+ if(BCNM STREQUAL "BCNM-NOTFOUND")
+ message(FATAL_ERROR "BCNM is required for the Installation Environment.")
+ endif()
target_link_libraries(horizon-qt5 ${BCNM} ${SKARNET} ${LIBUDEV_LIBRARIES} ${LibCap_LIBRARIES} ${LIBX11_LIBRARIES} ${XKBFile_LIBRARIES} diskman)
add_executable(horizon-run-qt5 ${RUN_QT_SOURCES})
target_link_libraries(horizon-run-qt5 Qt5::Widgets)