diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-11-17 17:44:48 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-11-17 17:44:48 -0600 |
| commit | d697b219406992900dbb731867a48391203b2c54 (patch) | |
| tree | 1319432ffb7e5fee610b5bacf51d4f05521a2bd8 | |
| parent | c88e00f1edcb7fb61d783fb7f5d2e9c35f056146 (diff) | |
| download | horizon-d697b219406992900dbb731867a48391203b2c54.tar.gz horizon-d697b219406992900dbb731867a48391203b2c54.tar.bz2 horizon-d697b219406992900dbb731867a48391203b2c54.tar.xz horizon-d697b219406992900dbb731867a48391203b2c54.zip | |
Build: Don't assume skarnet is installed globally
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ui/qt5/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0600bbf..ffb117f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,7 @@ 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.") diff --git a/ui/qt5/CMakeLists.txt b/ui/qt5/CMakeLists.txt index cef07fb..6279cc1 100644 --- a/ui/qt5/CMakeLists.txt +++ b/ui/qt5/CMakeLists.txt @@ -26,6 +26,6 @@ IF(INSTALL) pkg_check_modules(XKBFile REQUIRED xkbfile) pkg_check_modules(LIBX11 REQUIRED x11) pkg_check_modules(LibCap REQUIRED libcap) - target_link_libraries(horizon-qt5 ${BCNM} skarnet ${LIBUDEV_LIBRARIES} ${LibCap_LIBRARIES} ${LIBX11_LIBRARIES} ${XKBFile_LIBRARIES}) + target_link_libraries(horizon-qt5 ${BCNM} ${SKARNET} ${LIBUDEV_LIBRARIES} ${LibCap_LIBRARIES} ${LIBX11_LIBRARIES} ${XKBFile_LIBRARIES}) # add_executable(horizon-run-qt5 ${RUN_QT_SOURCES}) ENDIF(INSTALL) |