qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1509739 - /qpid/branches/0.24/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
Date Fri, 02 Aug 2013 15:24:55 GMT
Author: chug
Date: Fri Aug  2 15:24:54 2013
New Revision: 1509739

URL: http://svn.apache.org/r1509739
Log:
QPID-5028: Qmf2 examples install script error - merge fix to 0.24 release branch

Modified:
    qpid/branches/0.24/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt   (contents, props
changed)

Modified: qpid/branches/0.24/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt?rev=1509739&r1=1509738&r2=1509739&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt (original)
+++ qpid/branches/0.24/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt Fri Aug  2 15:24:54
2013
@@ -73,22 +73,11 @@ macro(add_installed_example subdir examp
   install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp
            DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/${subdir}
            COMPONENT ${QPID_COMPONENT_EXAMPLES})
-  if (MSVC)
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}_${example}.vcproj
-             DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/${subdir}
-             COMPONENT ${QPID_COMPONENT_EXAMPLES})
-  endif (MSVC)
-
 endmacro(add_installed_example)
 
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
          DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
          COMPONENT ${QPID_COMPONENT_EXAMPLES})
-if (MSVC)
-  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples.sln
-           DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
-           COMPONENT ${QPID_COMPONENT_EXAMPLES})
-endif (MSVC)
 
 add_installed_example(qmf2 agent qmf2)
 if (NOT WIN32)

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



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


Mime
View raw message