cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 05:48:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename event_extras to event_extra

Browse Source 
The library event_extras is named event_extra when building with
GNU autotools
This commit is contained in:
Trond Norbye 2014-02-19 06:29:58 +01:00
parent 565ea26bed
commit a0dd5df20a
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CMakeLists.txt
View File

@ -672,10 +672,16 @@ add_library(event_core STATIC
${SRC_CORE} ${SRC_CORE}
) )
add_library(event_extras STATIC add_library(event_extra STATIC
${HDR_PRIVATE}
${HDR_PUBLIC}
${SRC_CORE}
${SRC_EXTRA} ${SRC_EXTRA}
) )
# library exists for historical reasons; it contains the contents of
# both libevent_core and libevent_extra. You shouldn’t use it; it may
# go away in a future version of Libevent.
add_library(event STATIC add_library(event STATIC
${HDR_PRIVATE} ${HDR_PRIVATE}
${HDR_PUBLIC} ${HDR_PUBLIC}
@ -702,8 +708,8 @@ if (NOT EVENT__DISABLE_SAMPLES)
sample/https-client.c sample/https-client.c
sample/openssl_hostname_validation.c sample/openssl_hostname_validation.c
sample/hostcheck.c) sample/hostcheck.c)
target_link_libraries(https-client event ${LIB_APPS} ${LIB_PLATFORM}) target_link_libraries(https-client event_extra ${LIB_APPS} ${LIB_PLATFORM})
add_dependencies(https-client event) add_dependencies(https-client event_extra)
# Requires OpenSSL. # Requires OpenSSL.
list(APPEND SAMPLES le-proxy) list(APPEND SAMPLES le-proxy)
@ -711,8 +717,8 @@ if (NOT EVENT__DISABLE_SAMPLES)
foreach(SAMPLE ${SAMPLES}) foreach(SAMPLE ${SAMPLES})
add_executable(${SAMPLE} sample/${SAMPLE}.c) add_executable(${SAMPLE} sample/${SAMPLE}.c)
target_link_libraries(${SAMPLE} event ${LIB_APPS} ${LIB_PLATFORM}) target_link_libraries(${SAMPLE} event_extra ${LIB_APPS} ${LIB_PLATFORM})
add_dependencies(${SAMPLE} event) add_dependencies(${SAMPLE} event_extra)
endforeach() endforeach()
endif() endif()
@ -725,8 +731,8 @@ if (NOT EVENT__DISABLE_BENCHMARK)
endif() endif()
add_executable(${BENCHMARK} ${BENCH_SRC}) add_executable(${BENCHMARK} ${BENCH_SRC})
target_link_libraries(${BENCHMARK} event ${LIB_PLATFORM}) target_link_libraries(${BENCHMARK} event_extra ${LIB_PLATFORM})
add_dependencies(${BENCHMARK} event) add_dependencies(${BENCHMARK} event_extra)
endforeach() endforeach()
endif() endif()
@ -791,8 +797,8 @@ if (NOT EVENT__DISABLE_TESTS)
endif() endif()
add_executable(regress ${SRC_REGRESS}) add_executable(regress ${SRC_REGRESS})
target_link_libraries(regress event ${LIB_APPS} ${LIB_PLATFORM}) target_link_libraries(regress event_extra ${LIB_APPS} ${LIB_PLATFORM})
add_dependencies(regress event) add_dependencies(regress event_extra)
else() else()
message(WARNING "Python not found, cannot generate regress tests!") message(WARNING "Python not found, cannot generate regress tests!")
endif() endif()
@ -813,8 +819,8 @@ if (NOT EVENT__DISABLE_TESTS)
# Create test program executables. # Create test program executables.
foreach (TESTPROG ${ALL_TESTPROGS}) foreach (TESTPROG ${ALL_TESTPROGS})
add_executable(${TESTPROG} test/${TESTPROG}.c) add_executable(${TESTPROG} test/${TESTPROG}.c)
target_link_libraries(${TESTPROG} event ${LIB_PLATFORM}) target_link_libraries(${TESTPROG} event_extra ${LIB_PLATFORM})
add_dependencies(${TESTPROG} event) add_dependencies(${TESTPROG} event_extra)
endforeach() endforeach()
# #
@ -1015,7 +1021,7 @@ foreach(p LIB BIN INCLUDE CMAKE)
endforeach() endforeach()
# Export targets (This is used for other CMake projects to easily find the libraries and include files). # Export targets (This is used for other CMake projects to easily find the libraries and include files).
export(TARGETS event event_extras event_core export(TARGETS event event_extra event_core
FILE "${PROJECT_BINARY_DIR}/LibeventTargets.cmake") FILE "${PROJECT_BINARY_DIR}/LibeventTargets.cmake")
export(PACKAGE libevent) export(PACKAGE libevent)
@ -1050,13 +1056,13 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibeventConfigVersion.cmake.in
@ONLY) @ONLY)
# Define the public headers. # Define the public headers.
set_target_properties(event event_core event_extras set_target_properties(event event_core event_extra
PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}") PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")
# #
# Install targets. # Install targets.
# #
install(TARGETS event event_core event_extras install(TARGETS event event_core event_extra
EXPORT LibeventTargets EXPORT LibeventTargets
LIBRARY DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib LIBRARY DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib
ARCHIVE DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib ARCHIVE DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib
@ -1073,4 +1079,4 @@ install(FILES
install(EXPORT LibeventTargets install(EXPORT LibeventTargets
DESTINATION "${EVENT_INSTALL_CMAKE_DIR}" COMPONENT dev) DESTINATION "${EVENT_INSTALL_CMAKE_DIR}" COMPONENT dev)
set(LIBEVENT_LIBRARIES event event_core event_extras CACHE STRING "Libevent libraries") set(LIBEVENT_LIBRARIES event event_core event_extra CACHE STRING "Libevent libraries")