Repository: qpid-proton Updated Branches: refs/heads/master 69647801d -> 1792ff076
PROTON-1880: Install all Windows pdbs - Some small neutral rearrangements too Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1792ff07 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1792ff07 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1792ff07 Branch: refs/heads/master Commit: 1792ff076bbaeef4ec50957c3d96168c8571331c Parents: 6964780 Author: Andrew Stitcher <astitc...@apache.org> Authored: Thu Jun 28 23:23:14 2018 -0400 Committer: Andrew Stitcher <astitc...@apache.org> Committed: Fri Jun 29 00:09:09 2018 -0400 ---------------------------------------------------------------------- c/CMakeLists.txt | 71 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1792ff07/c/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt index dc869a3..df9ff62 100644 --- a/c/CMakeLists.txt +++ b/c/CMakeLists.txt @@ -542,21 +542,21 @@ set(qpid-proton-core-src ${qpid-proton-platform} ${qpid-proton-include} ${qpid-proton-include-generated} - ) +) + add_library (qpid-proton-core SHARED ${qpid-proton-core-src}) -add_dependencies(qpid-proton-core generated_c_files) +add_dependencies (qpid-proton-core generated_c_files) target_link_libraries (qpid-proton-core ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS}) -if (BUILD_STATIC_LIBS) - add_library (qpid-proton-core-static STATIC ${qpid-proton-core-src}) -endif(BUILD_STATIC_LIBS) - -set_target_properties ( - qpid-proton-core +set_target_properties (qpid-proton-core PROPERTIES VERSION "${PN_LIB_CORE_VERSION}" SOVERSION "${PN_LIB_CORE_MAJOR_VERSION}" LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" - ) +) + +if (BUILD_STATIC_LIBS) + add_library (qpid-proton-core-static STATIC ${qpid-proton-core-src}) +endif(BUILD_STATIC_LIBS) set(qpid-proton-src # Proton Core @@ -571,8 +571,17 @@ set(qpid-proton-src ${qpid-proton-extra} ${qpid-proton-platform-io} ${qpid-proton-include-extra} - ) -add_library(qpid-proton SHARED ${qpid-proton-src}) +) + +add_library (qpid-proton SHARED ${qpid-proton-src}) +target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS}) +set_target_properties (qpid-proton + PROPERTIES + VERSION "${PN_LIB_LEGACY_VERSION}" + SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}" + LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" +) + if (BUILD_STATIC_LIBS) add_library(qpid-proton-static STATIC ${qpid-proton-src}) endif(BUILD_STATIC_LIBS) @@ -585,16 +594,6 @@ if (MSVC) add_dependencies(qpid-proton qpid-proton-core) endif (MSVC) -target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS}) - -set_target_properties ( - qpid-proton - PROPERTIES - VERSION "${PN_LIB_LEGACY_VERSION}" - SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}" - LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" - ) - if (MSVC) # guard against use of C99 violating functions on Windows include(WindowsC99CheckDef) @@ -605,34 +604,50 @@ if (qpid-proton-proactor) add_library (qpid-proton-proactor SHARED ${qpid-proton-proactor}) target_link_libraries (qpid-proton-proactor LINK_PUBLIC qpid-proton-core) target_link_libraries (qpid-proton-proactor LINK_PRIVATE ${PLATFORM_LIBS} ${PROACTOR_LIBS}) - list(APPEND LIB_TARGETS qpid-proton-proactor) - set_target_properties ( - qpid-proton-proactor + set_target_properties (qpid-proton-proactor PROPERTIES VERSION "${PN_LIB_PROACTOR_VERSION}" SOVERSION "${PN_LIB_PROACTOR_MAJOR_VERSION}" LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}" - ) + ) if (BUILD_STATIC_LIBS) add_library (qpid-proton-proactor-static STATIC ${qpid-proton-proactor}) endif(BUILD_STATIC_LIBS) endif() # Install executables and libraries -install(TARGETS qpid-proton qpid-proton-core ${LIB_TARGETS} +install(TARGETS qpid-proton qpid-proton-core EXPORT proton RUNTIME DESTINATION bin ARCHIVE DESTINATION ${LIB_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) -# Install windows qpid-proton pdb files +# Install windows pdb files if (MSVC) - install(FILES $<TARGET_PDB_FILE:qpid-proton> + install(FILES + $<TARGET_PDB_FILE:qpid-proton> + $<TARGET_PDB_FILE:qpid-proton-core> DESTINATION bin CONFIGURATIONS RelWithDebInfo Debug OPTIONAL) endif (MSVC) +if (HAS_PROACTOR) + install(TARGETS qpid-proton-proactor + EXPORT proton + RUNTIME DESTINATION bin + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR}) + + # Install windows pdb files + if (MSVC) + install(FILES $<TARGET_PDB_FILE:qpid-proton-proactor> + DESTINATION bin + CONFIGURATIONS RelWithDebInfo Debug + OPTIONAL) + endif (MSVC) +endif () + # Install header files file(GLOB headers "${CMAKE_CURRENT_BINARY_DIR}/include/proton/*.[hi]") install (FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/proton) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
