gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added libztcore public headers to install section of CMakeLists.txt, also modified install paths

Browse Source
This commit is contained in:
Joseph Henry
2019-04-18 16:23:57 -07:00
parent a9035739e8
commit 2a377146d6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -509,10 +509,13 @@ set(PUBLIC_ZT_HEADERS
${PROJECT_SOURCE_DIR}/include/ZeroTier.h ${PROJECT_SOURCE_DIR}/include/ZeroTier.h
${PROJECT_SOURCE_DIR}/include/ZeroTierConstants.h) ${PROJECT_SOURCE_DIR}/include/ZeroTierConstants.h)
set(include_dest "include/zt") set(PUBLIC_ZTCORE_HEADERS
set(main_lib_dest "lib/zt") ${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}") 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} 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_ZT_HEADERS} DESTINATION "${include_dest}")
install(FILES ${PUBLIC_ZTCORE_HEADERS} DESTINATION "${include_dest}")
install(EXPORT ${STATIC_LIB_NAME} DESTINATION "${lib_dest}") install(EXPORT ${STATIC_LIB_NAME} DESTINATION "${lib_dest}")