qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1673897 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake src/CMakeLists.txt
Date Wed, 15 Apr 2015 17:52:32 GMT
Author: chug
Date: Wed Apr 15 17:52:32 2015
New Revision: 1673897

URL: http://svn.apache.org/r1673897
Log:
QPID-6493: cmake install TARGET component syntax error.
Patch from Scott M Stark.
Reviewed at https://reviews.apache.org/r/33195

This patch worked fine in my tests with the exception that using the install
command 'cmake -DCOMPONENT=development -P src/cmake_install.cmake' executes
the install but does not produce an install_manifest.txt file. While not 
essential the install_manifest.txt files are part of my routine housekeeping.


Modified:
    qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
    qpid/trunk/qpid/cpp/src/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=1673897&r1=1673896&r2=1673897&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Wed Apr 15 17:52:32 2015
@@ -143,7 +143,7 @@ if (UNIX)
   set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION_FULL}
CACHE PATH "Shared read only data directory")
   mark_as_advanced(INCLUDE_INSTALL_DIR LIB_INSTALL_DIR SYSCONF_INSTALL_DIR SHARE_INSTALL_DIR
DOC_INSTALL_DIR)
 
-  set (QPID_COMPONENT_BROKER runtime)
+  set (QPID_COMPONENT_BROKER broker)
   set (QPID_COMPONENT_CLIENT runtime)
   set (QPID_COMPONENT_COMMON runtime)
   set (CPACK_COMPONENT_RUNTIME_DISPLAY_NAME
@@ -185,5 +185,4 @@ if (UNIX)
   if("${isSystemDir}" STREQUAL "-1")
     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
   endif("${isSystemDir}" STREQUAL "-1")
-
 endif (UNIX)

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1673897&r1=1673896&r2=1673897&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Apr 15 17:52:32 2015
@@ -865,10 +865,9 @@ set_target_properties (qpidcommon PROPER
                        SOVERSION ${qpidcommon_version_major})
 
 install (TARGETS qpidcommon
-         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR}
-         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-         COMPONENT ${QPID_COMPONENT_COMMON})
+         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_COMMON}
+         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}
+         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON})
 install_pdb (qpidcommon ${QPID_COMPONENT_COMMON})
 
 set(qpidtypes_SOURCES
@@ -891,10 +890,9 @@ set_target_properties (qpidtypes PROPERT
                        SOVERSION ${qpidtypes_version_major})
 
 install(TARGETS qpidtypes
-        RUNTIME DESTINATION ${QPID_INSTALL_BINDIR}
-        LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-        COMPONENT ${QPID_COMPONENT_COMMON})
+        RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_COMMON}
+        LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON}
+        ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_COMMON})
 install_pdb (qpidtypes ${QPID_COMPONENT_COMMON})
 
 add_api_test(qpidtypes)
@@ -950,10 +948,9 @@ set_target_properties (qpidclient PROPER
                        SOVERSION ${qpidclient_version_major})
 
 install (TARGETS qpidclient
-         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR}
-         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-         COMPONENT ${QPID_COMPONENT_CLIENT})
+         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
+         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
+         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT})
 install (DIRECTORY ../include/qpid
          DESTINATION ${QPID_INSTALL_INCLUDEDIR}
          COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE}
@@ -1018,10 +1015,9 @@ set_target_properties (qpidmessaging PRO
                        VERSION ${qpidmessaging_version}
                        SOVERSION ${qpidmessaging_version_major})
 install (TARGETS qpidmessaging
-         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR}
-         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-         COMPONENT ${QPID_COMPONENT_CLIENT})
+         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
+         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
+         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT})
 install_pdb (qpidmessaging ${QPID_COMPONENT_CLIENT})
 
 add_api_test(qpidmessaging)
@@ -1035,10 +1031,9 @@ if (MSVC)
         add_library (qpidxarm SHARED ${qpidxarm_SOURCES})
         target_link_libraries (qpidxarm qpidclient qpidcommon)
         install (TARGETS qpidxarm
-                 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR}
-                 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-                 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-                 COMPONENT ${QPID_COMPONENT_CLIENT})
+                 RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
+                 LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}
+                 ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT})
         install_pdb (qpidxarm ${QPID_COMPONENT_CLIENT})
     endif (EXISTS ${qpidxarm_SOURCES})
 endif (MSVC)
@@ -1162,10 +1157,9 @@ if (MSVC)
   set_target_properties (qpidbroker PROPERTIES COMPILE_FLAGS /wd4290)
 endif (MSVC)
 install (TARGETS qpidbroker
-         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR}
-         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-         COMPONENT ${QPID_COMPONENT_BROKER})
+         RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_BROKER}
+         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_BROKER}
+         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_BROKER})
 install_pdb (qpidbroker ${QPID_COMPONENT_BROKER})
 
 
@@ -1179,10 +1173,9 @@ add_executable (qpidd ${qpidd_SOURCES})
 target_link_libraries (qpidd qpidbroker qpidcommon)
 set_target_properties (qpidd PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER)
 install (TARGETS qpidd
-         RUNTIME DESTINATION ${QPID_INSTALL_SBINDIR}
-         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-         COMPONENT ${QPID_COMPONENT_BROKER})
+         RUNTIME DESTINATION ${QPID_INSTALL_SBINDIR} COMPONENT ${QPID_COMPONENT_BROKER}
+         LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_BROKER}
+         ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_BROKER})
 if (CPACK_GENERATOR STREQUAL "NSIS")
     set (CPACK_NSIS_MENU_LINKS
          "qpidd" "Start Qpid Broker")
@@ -1271,10 +1264,9 @@ endif (NOT WIN32)
                            VERSION ${qmf2_version}
                            SOVERSION ${qmf2_version_major})
     install (TARGETS qmf2 OPTIONAL
-            RUNTIME DESTINATION ${QPID_INSTALL_BINDIR}
-            LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR}
-            ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR}
-            COMPONENT ${QPID_COMPONENT_QMF})
+            RUNTIME DESTINATION ${QPID_INSTALL_BINDIR} COMPONENT ${QPID_COMPONENT_QMF}
+            LIBRARY DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_QMF}
+            ARCHIVE DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_QMF})
     install (FILES ${qmf2_HEADERS}
             DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf
             COMPONENT ${QPID_COMPONENT_QMF})
@@ -1333,3 +1325,4 @@ install (FILES
          ${CMAKE_CURRENT_BINARY_DIR}/QpidConfigVersion.cmake
          DESTINATION ${QPID_INSTALL_LIBDIR}/cmake/Qpid
          COMPONENT ${QPID_COMPONENT_COMMON})
+



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message