Restore previous install behavior in CMakeLists
This commit is contained in:
@@ -86,14 +86,19 @@ include_directories(${LWIP_PORT_DIR}/include)
|
||||
# | TARGET AND VARIANT SELECTION |
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# Defaults
|
||||
set(ALLOW_INSTALL_TARGET TRUE)
|
||||
set(BUILD_STATIC_LIB TRUE)
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
|
||||
# C# language bindings (libzt.dll/dylib/so)
|
||||
if (ZTS_ENABLE_PINVOKE)
|
||||
# Features
|
||||
set(BUILD_STATIC_LIB FALSE)
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
set(BUILD_EXAMPLES FALSE)
|
||||
set(ALLOW_INSTALL_TARGET FALSE)
|
||||
set(BUILD_HOST_SELFTEST FALSE)
|
||||
set(INSTALLABLE FALSE)
|
||||
# Sources and libraries
|
||||
set(ZTS_SWIG_WRAPPER_FILE ${LIBZT_SRC_DIR}/bindings/csharp/*.cpp)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZTS_ENABLE_PINVOKE=1")
|
||||
@@ -108,8 +113,8 @@ if (ZTS_ENABLE_PYTHON)
|
||||
set(BUILD_STATIC_LIB FALSE)
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
set(BUILD_EXAMPLES FALSE)
|
||||
set(ALLOW_INSTALL_TARGET FALSE)
|
||||
set(BUILD_HOST_SELFTEST FALSE)
|
||||
set(INSTALLABLE FALSE)
|
||||
# Sources and libraries
|
||||
find_package(PythonLibs REQUIRED)
|
||||
include_directories(${PYTHON_INCLUDE_DIRS})
|
||||
@@ -122,9 +127,9 @@ if (ZTS_ENABLE_JAVA)
|
||||
set(BUILD_STATIC_LIB FALSE)
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
set(BUILD_HOST_EXAMPLES FALSE)
|
||||
set(ALLOW_INSTALL_TARGET FALSE)
|
||||
set(BUILD_HOST_SELFTEST FALSE)
|
||||
set(ZTS_ENABLE_STATS FALSE)
|
||||
set(INSTALLABLE FALSE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZTS_ENABLE_JAVA=1")
|
||||
endif()
|
||||
|
||||
@@ -133,9 +138,9 @@ if(BUILD_HOST)
|
||||
set(BUILD_STATIC_LIB TRUE)
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
set(BUILD_HOST_EXAMPLES TRUE)
|
||||
set(ALLOW_INSTALL_TARGET TRUE)
|
||||
set(BUILD_HOST_SELFTEST TRUE)
|
||||
set(ZTS_ENABLE_STATS TRUE)
|
||||
set(INSTALLABLE TRUE)
|
||||
endif()
|
||||
|
||||
# CI
|
||||
@@ -143,9 +148,9 @@ if(BUILD_HOST_SELFTEST_ONLY)
|
||||
set(BUILD_STATIC_LIB TRUE)
|
||||
set(BUILD_SHARED_LIB FALSE)
|
||||
set(BUILD_HOST_EXAMPLES FALSE)
|
||||
set(ALLOW_INSTALL_TARGET FALSE)
|
||||
set(BUILD_HOST_SELFTEST TRUE)
|
||||
set(ZTS_ENABLE_STATS FALSE)
|
||||
set(INSTALLABLE FALSE)
|
||||
endif()
|
||||
|
||||
# Android AAR containing libzt.so
|
||||
@@ -155,7 +160,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
set(BUILD_SELFTEST FALSE)
|
||||
set(BUILD_EXAMPLES FALSE)
|
||||
set(INSTALLABLE FALSE)
|
||||
set(ALLOW_INSTALL_TARGET FALSE)
|
||||
endif()
|
||||
|
||||
if(BUILD_MACOS_FRAMEWORK)
|
||||
@@ -163,7 +168,7 @@ if(BUILD_MACOS_FRAMEWORK)
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
set(BUILD_SELFTEST FALSE)
|
||||
set(BUILD_EXAMPLES FALSE)
|
||||
set(INSTALLABLE FALSE)
|
||||
set(ALLOW_INSTALL_TARGET FALSE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOMIT_JSON_SUPPORT=1")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DOMIT_JSON_SUPPORT=1")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS "$(ARCHS_STANDARD)")
|
||||
@@ -177,7 +182,7 @@ if(BUILD_IOS_FRAMEWORK)
|
||||
set(BUILD_SHARED_LIB TRUE)
|
||||
set(BUILD_SELFTEST FALSE)
|
||||
set(BUILD_EXAMPLES FALSE)
|
||||
set(INSTALLABLE FALSE)
|
||||
set(ALLOW_INSTALL_TARGET FALSE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOMIT_JSON_SUPPORT=1")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DOMIT_JSON_SUPPORT=1")
|
||||
set(DEVROOT
|
||||
@@ -703,7 +708,7 @@ endif()
|
||||
# | INSTALL |
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
if(INSTALLABLE)
|
||||
if (ALLOW_INSTALL_TARGET)
|
||||
set(PUBLIC_ZT_HEADERS ${PROJECT_SOURCE_DIR}/include/ZeroTierSockets.h)
|
||||
set_target_properties(${STATIC_LIB_NAME} PROPERTIES PUBLIC_HEADER
|
||||
"${PUBLIC_ZT_HEADERS}")
|
||||
@@ -716,4 +721,4 @@ if(INSTALLABLE)
|
||||
TARGETS ${DYNAMIC_LIB_NAME}
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user