You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2011/02/19 00:42:21 UTC

svn commit: r1072197 - /qpid/trunk/qpid/cpp/src/CMakeLists.txt

Author: tross
Date: Fri Feb 18 23:42:20 2011
New Revision: 1072197

URL: http://svn.apache.org/viewvc?rev=1072197&view=rev
Log:
QPID-3061 - blocked qmf2 build for Windows until dependency issues are resolved.

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

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1072197&r1=1072196&r2=1072197&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Feb 18 23:42:20 2011
@@ -1083,80 +1083,82 @@ install (TARGETS qmf OPTIONAL
          COMPONENT ${QPID_COMPONENT_QMF})
 install_pdb (qmf ${QPID_COMPONENT_QMF})
 
-set (qmf2_HEADERS
-    ../include/qmf/AgentEvent.h
-    ../include/qmf/Agent.h
-    ../include/qmf/AgentSession.h
-    ../include/qmf/ConsoleEvent.h
-    ../include/qmf/ConsoleSession.h
-    ../include/qmf/DataAddr.h
-    ../include/qmf/Data.h
-    ../include/qmf/exceptions.h
-    ../include/qmf/Handle.h
-    ../include/qmf/ImportExport.h
-    ../include/qmf/Query.h
-    ../include/qmf/Schema.h
-    ../include/qmf/SchemaId.h
-    ../include/qmf/SchemaMethod.h
-    ../include/qmf/SchemaProperty.h
-    ../include/qmf/SchemaTypes.h
-    ../include/qmf/Subscription.h
-    )
-
-set (qmf2_SOURCES
-    ${qmf2_HEADERS}
-    qmf/agentCapability.h
-    qmf/Agent.cpp
-    qmf/AgentEvent.cpp
-    qmf/AgentEventImpl.h
-    qmf/AgentImpl.h
-    qmf/AgentSession.cpp
-    qmf/AgentSubscription.cpp
-    qmf/AgentSubscription.h
-    qmf/ConsoleEvent.cpp
-    qmf/ConsoleEventImpl.h
-    qmf/ConsoleSession.cpp
-    qmf/ConsoleSessionImpl.h
-    qmf/constants.cpp
-    qmf/constants.h
-    qmf/DataAddr.cpp
-    qmf/DataAddrImpl.h
-    qmf/Data.cpp
-    qmf/DataImpl.h
-    qmf/exceptions.cpp
-    qmf/Expression.cpp
-    qmf/Expression.h
-    qmf/Hash.cpp
-    qmf/Hash.h
-    qmf/PrivateImplRef.h
-    qmf/Query.cpp
-    qmf/QueryImpl.h
-    qmf/Schema.cpp
-    qmf/SchemaCache.cpp
-    qmf/SchemaCache.h
-    qmf/SchemaId.cpp
-    qmf/SchemaIdImpl.h
-    qmf/SchemaImpl.h
-    qmf/SchemaMethod.cpp
-    qmf/SchemaMethodImpl.h
-    qmf/SchemaProperty.cpp
-    qmf/SchemaPropertyImpl.h
-    qmf/Subscription.cpp
-    qmf/SubscriptionImpl.h
-    )
-
-add_msvc_version (qmf2 library dll)
-add_library (qmf2 SHARED ${qmf2_SOURCES})
-target_link_libraries (qmf2 qpidmessaging qpidtypes)
-set_target_properties (qmf2 PROPERTIES
-                       VERSION ${qmf2_version})
-install (TARGETS qmf2 OPTIONAL
-         DESTINATION ${QPID_INSTALL_LIBDIR}
-         COMPONENT ${QPID_COMPONENT_QMF})
-install (FILES ${qmf2_HEADERS}
-         DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf
-         COMPONENT ${QPID_COMPONENT_QMF})
-install_pdb (qmf2 ${QPID_COMPONENT_QMF})
+if(NOT WIN32)
+    set (qmf2_HEADERS
+        ../include/qmf/AgentEvent.h
+        ../include/qmf/Agent.h
+        ../include/qmf/AgentSession.h
+        ../include/qmf/ConsoleEvent.h
+        ../include/qmf/ConsoleSession.h
+        ../include/qmf/DataAddr.h
+        ../include/qmf/Data.h
+        ../include/qmf/exceptions.h
+        ../include/qmf/Handle.h
+        ../include/qmf/ImportExport.h
+        ../include/qmf/Query.h
+        ../include/qmf/Schema.h
+        ../include/qmf/SchemaId.h
+        ../include/qmf/SchemaMethod.h
+        ../include/qmf/SchemaProperty.h
+        ../include/qmf/SchemaTypes.h
+        ../include/qmf/Subscription.h
+        )
+
+    set (qmf2_SOURCES
+        ${qmf2_HEADERS}
+        qmf/agentCapability.h
+        qmf/Agent.cpp
+        qmf/AgentEvent.cpp
+        qmf/AgentEventImpl.h
+        qmf/AgentImpl.h
+        qmf/AgentSession.cpp
+        qmf/AgentSubscription.cpp
+        qmf/AgentSubscription.h
+        qmf/ConsoleEvent.cpp
+        qmf/ConsoleEventImpl.h
+        qmf/ConsoleSession.cpp
+        qmf/ConsoleSessionImpl.h
+        qmf/constants.cpp
+        qmf/constants.h
+        qmf/DataAddr.cpp
+        qmf/DataAddrImpl.h
+        qmf/Data.cpp
+        qmf/DataImpl.h
+        qmf/exceptions.cpp
+        qmf/Expression.cpp
+        qmf/Expression.h
+        qmf/Hash.cpp
+        qmf/Hash.h
+        qmf/PrivateImplRef.h
+        qmf/Query.cpp
+        qmf/QueryImpl.h
+        qmf/Schema.cpp
+        qmf/SchemaCache.cpp
+        qmf/SchemaCache.h
+        qmf/SchemaId.cpp
+        qmf/SchemaIdImpl.h
+        qmf/SchemaImpl.h
+        qmf/SchemaMethod.cpp
+        qmf/SchemaMethodImpl.h
+        qmf/SchemaProperty.cpp
+        qmf/SchemaPropertyImpl.h
+        qmf/Subscription.cpp
+        qmf/SubscriptionImpl.h
+        )
+
+    add_msvc_version (qmf2 library dll)
+    add_library (qmf2 SHARED ${qmf2_SOURCES})
+    target_link_libraries (qmf2 qpidmessaging qpidtypes qpidclient qpidcommon)
+    set_target_properties (qmf2 PROPERTIES
+                        VERSION ${qmf2_version})
+    install (TARGETS qmf2 OPTIONAL
+            DESTINATION ${QPID_INSTALL_LIBDIR}
+            COMPONENT ${QPID_COMPONENT_QMF})
+    install (FILES ${qmf2_HEADERS}
+            DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf
+            COMPONENT ${QPID_COMPONENT_QMF})
+    install_pdb (qmf2 ${QPID_COMPONENT_QMF})
+endif (NOT WIN32)
 
 set (qmfengine_SOURCES
      qmf/engine/Agent.cpp



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org