From f490a429d28069fd40ed711adfea13e0c4cd0651 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 20 Oct 2019 00:57:13 -0500 Subject: hscript: Build fixes for Mac OS X 10.12.6 (Xcode 9) --- hscript/CMakeLists.txt | 8 +++++++- hscript/meta.cc | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hscript/CMakeLists.txt b/hscript/CMakeLists.txt index 60ca8a9..046b1ff 100644 --- a/hscript/CMakeLists.txt +++ b/hscript/CMakeLists.txt @@ -12,7 +12,13 @@ set(HSCRIPT_INCLUDE key.hh ) -add_library(hscript SHARED ${HSCRIPT_SOURCE}) +IF(INSTALL) +set(HSCRIPT_LIBRARY_TYPE SHARED) +ELSE(INSTALL) +set(HSCRIPT_LIBRARY_TYPE STATIC) +ENDIF(INSTALL) + +add_library(hscript ${HSCRIPT_LIBRARY_TYPE} ${HSCRIPT_SOURCE}) target_compile_features(hscript PRIVATE cxx_nullptr) target_compile_features(hscript PUBLIC cxx_unicode_literals) target_link_libraries(hscript ${BLKID_LIBRARIES}) diff --git a/hscript/meta.cc b/hscript/meta.cc index 02b294d..7e8cfe8 100644 --- a/hscript/meta.cc +++ b/hscript/meta.cc @@ -13,6 +13,7 @@ #include #include #include +#include #ifdef HAS_INSTALL_ENV # include #endif /* HAS_INSTALL_ENV */ -- cgit v1.2.3-70-g09d2