cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 01:36:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

cmake: eliminate duplicate installation of public headers

Browse Source 
(cherry picked from commit 5fe83d7433022e29a401753f64ec78faaf25e0a7)
This commit is contained in:
yuangongji 2019-10-25 21:54:13 +08:00 committed by Azat Khuzhin
parent 87c6f7358e
commit a9d1121d16
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1479,6 +1479,11 @@ install(FILES ${HDR_COMPAT}
DESTINATION "include" DESTINATION "include"
COMPONENT dev) COMPONENT dev)
# Install public headers
install(FILES ${HDR_PUBLIC}
DESTINATION "include/event2"
COMPONENT dev)
# Install the configs. # Install the configs.
install(FILES install(FILES
${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/LibeventConfig.cmake ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/LibeventConfig.cmake

11
cmake/AddEventLibrary.cmake
View File

@ -44,8 +44,6 @@ endmacro()
# - EVENT_PACKAGE_RELEASE # - EVENT_PACKAGE_RELEASE
# - CMAKE_THREAD_LIBS_INIT LIB_PLATFORM # - CMAKE_THREAD_LIBS_INIT LIB_PLATFORM
# - OPENSSL_LIBRARIES # - OPENSSL_LIBRARIES
# - HDR_PUBLIC
# - EVENT_INSTALL_INCLUDE_DIR
# - EVENT_SHARED_FLAGS # - EVENT_SHARED_FLAGS
# - EVENT_LIBRARY_STATIC # - EVENT_LIBRARY_STATIC
# - EVENT_LIBRARY_SHARED # - EVENT_LIBRARY_SHARED
@ -69,9 +67,6 @@ macro(add_event_library LIB_NAME)
set_target_properties("${LIB_NAME}_static" PROPERTIES set_target_properties("${LIB_NAME}_static" PROPERTIES
OUTPUT_NAME "${LIB_NAME}" OUTPUT_NAME "${LIB_NAME}"
CLEAN_DIRECT_OUTPUT 1) CLEAN_DIRECT_OUTPUT 1)
set_target_properties(
"${LIB_NAME}_static" PROPERTIES
PUBLIC_HEADER "${HDR_PUBLIC}")
list(APPEND LIBEVENT_STATIC_LIBRARIES "${LIB_NAME}_static") list(APPEND LIBEVENT_STATIC_LIBRARIES "${LIB_NAME}_static")
list(APPEND ADD_EVENT_LIBRARY_TARGETS "${LIB_NAME}_static") list(APPEND ADD_EVENT_LIBRARY_TARGETS "${LIB_NAME}_static")
@ -113,11 +108,6 @@ macro(add_event_library LIB_NAME)
SOVERSION "${CURRENT_MINUS_AGE}") SOVERSION "${CURRENT_MINUS_AGE}")
endif() endif()
set_target_properties(
"${LIB_NAME}_shared" PROPERTIES
PUBLIC_HEADER "${HDR_PUBLIC}"
CLEAN_DIRECT_OUTPUT 1)
if (NOT WIN32) if (NOT WIN32)
set(LIB_LINK_NAME set(LIB_LINK_NAME
"${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}") "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
@ -146,7 +136,6 @@ macro(add_event_library LIB_NAME)
LIBRARY DESTINATION "lib" COMPONENT lib LIBRARY DESTINATION "lib" COMPONENT lib
ARCHIVE DESTINATION "lib" COMPONENT lib ARCHIVE DESTINATION "lib" COMPONENT lib
RUNTIME DESTINATION "lib" COMPONENT lib RUNTIME DESTINATION "lib" COMPONENT lib
PUBLIC_HEADER DESTINATION "include/event2"
COMPONENT dev COMPONENT dev
) )
if (NOT WIN32 AND ${EVENT_LIBRARY_SHARED}) if (NOT WIN32 AND ${EVENT_LIBRARY_SHARED})