summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-11-02 15:36:25 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-11-02 15:36:25 -0500
commit43623d6ac1cf83e9a9e6a1848fd8825863afbdb3 (patch)
treeca1652aa618dda80b699ec99f26aa24cc33ca88f /CMakeLists.txt
parente94500bc8b7d7e33670774dff76ba4e9b1108659 (diff)
downloadhorizon-43623d6ac1cf83e9a9e6a1848fd8825863afbdb3.tar.gz
horizon-43623d6ac1cf83e9a9e6a1848fd8825863afbdb3.tar.bz2
horizon-43623d6ac1cf83e9a9e6a1848fd8825863afbdb3.tar.xz
horizon-43623d6ac1cf83e9a9e6a1848fd8825863afbdb3.zip
Add Executor utility
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt18
1 files changed, 11 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c423185..0345603 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,15 @@ IF(NOT HAVE_LINUX_WIRELESS_H)
SET(INSTALL OFF)
ENDIF(NOT HAVE_LINUX_WIRELESS_H)
+
+include_directories(.)
+
+
+## Test stuff ##
+find_program(RSPEC_EXECUTABLE NAMES rspec)
+enable_testing()
+
+
IF(INSTALL)
add_definitions(-DHAS_INSTALL_ENV)
pkg_check_modules(BLKID REQUIRED blkid)
@@ -60,18 +69,13 @@ IF(INSTALL)
pkg_check_modules(PARTED REQUIRED libparted)
find_library(BCNM_LIBRARY REQUIRED wpactrl PATH_SUFFIXES bcnm)
set(BUILD_SHARED_LIBS ON)
+
+ add_subdirectory(executor)
ELSE(INSTALL)
set(BUILD_SHARED_LIBS OFF)
ENDIF(INSTALL)
-include_directories(.)
-
-
-## Test stuff ##
-find_program(RSPEC_EXECUTABLE NAMES rspec)
-enable_testing()
-
add_subdirectory(hscript)
IF(BUILD_TOOLS)
add_subdirectory(tools)