qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1509738 - /qpid/branches/0.24/qpid/cpp/BuildInstallSettings.cmake
Date Fri, 02 Aug 2013 15:20:41 GMT
Author: chug
Date: Fri Aug  2 15:20:41 2013
New Revision: 1509738

URL: http://svn.apache.org/r1509738
Log:
QPID-5027: Windows examples installed to wrong directory - merge fix to 0.24 release branch

Modified:
    qpid/branches/0.24/qpid/cpp/BuildInstallSettings.cmake   (contents, props changed)

Modified: qpid/branches/0.24/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/cpp/BuildInstallSettings.cmake?rev=1509738&r1=1509737&r2=1509738&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/branches/0.24/qpid/cpp/BuildInstallSettings.cmake Fri Aug  2 15:20:41 2013
@@ -93,7 +93,7 @@ if (WIN32)
     "Directory to install SASL configuration files")
   set (QPID_INSTALL_DATADIR conf CACHE STRING
     "Directory to install read-only arch.-independent data root")
-  set (QPID_INSTALL_EXAMPLESDIR qpid/examples CACHE STRING
+  set (QPID_INSTALL_EXAMPLESDIR examples CACHE STRING
     "Directory to install programming examples in")
   set (QPID_INSTALL_DOCDIR docs CACHE STRING
     "Directory to install documentation")

Propchange: qpid/branches/0.24/qpid/cpp/BuildInstallSettings.cmake
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug  2 15:20:41 2013
@@ -0,0 +1,8 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/BuildInstallSettings.cmake:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/BuildInstallSettings.cmake:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/BuildInstallSettings.cmake:926803,927233
+/qpid/branches/java-network-refactor/qpid/cpp/BuildInstallSettings.cmake:805429-825319
+/qpid/branches/mcpierce-QPID-4719/qpid/cpp/BuildInstallSettings.cmake:1477004-1477093
+/qpid/branches/qpid-2935/qpid/cpp/BuildInstallSettings.cmake:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/BuildInstallSettings.cmake:1144319-1179855
+/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake:1504429,1504451,1505029,1507370,1508866



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


Mime
View raw message