diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-10-28 12:39:59 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-10-28 12:39:59 +0000 |
| commit | 1a3440711f5b9ec06ed3d81ee4ff906f92476e83 (patch) | |
| tree | 2b3c9b5e0c97c7c3ab87628efa17ce9b182a152f /qpid/cpp | |
| parent | 265821ba0b9ea2eb77ceb9158ceb83fffe12bc8f (diff) | |
| download | qpid-python-1a3440711f5b9ec06ed3d81ee4ff906f92476e83.tar.gz | |
QPID-5261: Install DLLs and import Libs to more usual places for a windows SDK
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1536330 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 36 |
2 files changed, 27 insertions, 11 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index a8bf3a03c9..eaa65f78ef 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/cpp/BuildInstallSettings.cmake @@ -99,7 +99,7 @@ if (WIN32) "Directory to install documentation") set (QPID_INSTALL_INCLUDEDIR include CACHE STRING "Directory to install programming header files") - set (QPID_INSTALL_LIBDIR bin CACHE STRING + set (QPID_INSTALL_LIBDIR lib CACHE STRING "Directory to install library files") set (QPID_INSTALL_MANDIR docs CACHE STRING "Directory to install manual files") diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 6daac70273..82bbd201ff 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -1092,7 +1092,9 @@ set_target_properties (qpidcommon PROPERTIES SOVERSION ${qpidcommon_version_major}) install (TARGETS qpidcommon - DESTINATION ${QPID_INSTALL_LIBDIR} + RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}) install_pdb (qpidcommon ${QPID_COMPONENT_COMMON}) @@ -1116,8 +1118,10 @@ set_target_properties (qpidtypes PROPERTIES SOVERSION ${qpidtypes_version_major}) install(TARGETS qpidtypes - DESTINATION ${QPID_INSTALL_LIBDIR} - COMPONENT ${QPID_COMPONENT_COMMON}) + RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} + COMPONENT ${QPID_COMPONENT_COMMON}) install_pdb (qpidtypes ${QPID_COMPONENT_COMMON}) add_api_test(qpidtypes) @@ -1173,7 +1177,9 @@ set_target_properties (qpidclient PROPERTIES SOVERSION ${qpidclient_version_major}) install (TARGETS qpidclient - DESTINATION ${QPID_INSTALL_LIBDIR} + RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}) install (DIRECTORY ../include/qpid DESTINATION ${QPID_INSTALL_INCLUDEDIR} @@ -1237,7 +1243,9 @@ set_target_properties (qpidmessaging PROPERTIES VERSION ${qpidmessaging_version} SOVERSION ${qpidmessaging_version_major}) install (TARGETS qpidmessaging - DESTINATION ${QPID_INSTALL_LIBDIR} + RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}) install_pdb (qpidmessaging ${QPID_COMPONENT_CLIENT}) @@ -1252,7 +1260,9 @@ if (MSVC) add_library (qpidxarm SHARED ${qpidxarm_SOURCES}) target_link_libraries (qpidxarm qpidclient qpidcommon) install (TARGETS qpidxarm - DESTINATION ${QPID_INSTALL_LIBDIR} + RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}) install_pdb (qpidxarm ${QPID_COMPONENT_CLIENT}) endif (EXISTS ${qpidxarm_SOURCES}) @@ -1372,7 +1382,9 @@ if (MSVC) set_target_properties (qpidbroker PROPERTIES COMPILE_FLAGS /wd4290) endif (MSVC) install (TARGETS qpidbroker - DESTINATION ${QPID_INSTALL_LIBDIR} + RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_BROKER}) install_pdb (qpidbroker ${QPID_COMPONENT_BROKER}) @@ -1386,8 +1398,10 @@ add_msvc_version (qpidd application exe) add_executable (qpidd ${qpidd_SOURCES}) target_link_libraries (qpidd qpidbroker qpidcommon ${Boost_PROGRAM_OPTIONS_LIBRARY}) set_target_properties (qpidd PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER) -install (TARGETS qpidd RUNTIME - DESTINATION ${QPID_INSTALL_SBINDIR} +install (TARGETS qpidd + RUNTIME DESTINATION ${QPID_INSTALL_SBINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_BROKER}) if (CPACK_GENERATOR STREQUAL "NSIS") set (CPACK_NSIS_MENU_LINKS @@ -1477,7 +1491,9 @@ endif (NOT WIN32) VERSION ${qmf2_version} SOVERSION ${qmf2_version_major}) install (TARGETS qmf2 OPTIONAL - DESTINATION ${QPID_INSTALL_LIBDIR} + RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} + LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_QMF}) install (FILES ${qmf2_HEADERS} DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf |