diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-10-21 21:53:27 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-10-21 21:53:27 -0500 |
| commit | a05f77c6755047c96c721a09c10a536a9342d7e9 (patch) | |
| tree | 4aa2f0cea12eda9d22fd3984b44ae545040fec62 | |
| parent | 8c5782b7a29f7d72cd81fa3bc270e4423c741033 (diff) | |
| download | horizon-a05f77c6755047c96c721a09c10a536a9342d7e9.tar.gz horizon-a05f77c6755047c96c721a09c10a536a9342d7e9.tar.bz2 horizon-a05f77c6755047c96c721a09c10a536a9342d7e9.tar.xz horizon-a05f77c6755047c96c721a09c10a536a9342d7e9.zip | |
CMake: Drastically simplifify hscript library building
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | hscript/CMakeLists.txt | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 95e82f9..a265600 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,9 @@ IF(INSTALL) pkg_check_modules(LIBUDEV REQUIRED libudev) pkg_check_modules(PARTED REQUIRED libparted) find_library(BCNM_LIBRARY REQUIRED wpactrl PATH_SUFFIXES bcnm) + set(BUILD_SHARED_LIBS ON) +ELSE(INSTALL) + set(BUILD_SHARED_LIBS OFF) ENDIF(INSTALL) diff --git a/hscript/CMakeLists.txt b/hscript/CMakeLists.txt index 036fa34..ed3d58f 100644 --- a/hscript/CMakeLists.txt +++ b/hscript/CMakeLists.txt @@ -8,17 +8,10 @@ set(HSCRIPT_SOURCE ) set(HSCRIPT_INCLUDE - script.hh - key.hh + script.hh ) -IF(INSTALL) -set(HSCRIPT_LIBRARY_TYPE SHARED) -ELSE(INSTALL) -set(HSCRIPT_LIBRARY_TYPE STATIC) -ENDIF(INSTALL) - -add_library(hscript ${HSCRIPT_LIBRARY_TYPE} ${HSCRIPT_SOURCE}) +add_library(hscript ${HSCRIPT_SOURCE}) target_compile_features(hscript PRIVATE cxx_nullptr) target_compile_features(hscript PUBLIC cxx_unicode_literals) target_link_libraries(hscript ${BLKID_LIBRARIES} ${LIBUDEV_LIBRARIES}) |