From 2a377146d6124bb004b9aa263c47f7df2366e7ea Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 18 Apr 2019 16:23:57 -0700 Subject: [PATCH] Added libztcore public headers to install section of CMakeLists.txt, also modified install paths --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 353adb8..9024431 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -509,10 +509,13 @@ set(PUBLIC_ZT_HEADERS ${PROJECT_SOURCE_DIR}/include/ZeroTier.h ${PROJECT_SOURCE_DIR}/include/ZeroTierConstants.h) -set(include_dest "include/zt") -set(main_lib_dest "lib/zt") +set(PUBLIC_ZTCORE_HEADERS + ${PROJECT_SOURCE_DIR}/ext/ZeroTierOne/include/ZeroTierOne.h) + +set(include_dest "include") +set(main_lib_dest "lib") set(lib_dest "${main_lib_dest}/${CMAKE_BUILD_TYPE}") install(TARGETS ${STATIC_LIB_NAME} EXPORT ${STATIC_LIB_NAME} DESTINATION "${lib_dest}") -#install(TARGETS ${STATIC_LIB_NAME} DESTINATION "${main_lib_dest}") install(FILES ${PUBLIC_ZT_HEADERS} DESTINATION "${include_dest}") +install(FILES ${PUBLIC_ZTCORE_HEADERS} DESTINATION "${include_dest}") install(EXPORT ${STATIC_LIB_NAME} DESTINATION "${lib_dest}")