summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/CMakeLists.txt
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2009-11-20 01:04:03 +0000
committerStephen D. Huston <shuston@apache.org>2009-11-20 01:04:03 +0000
commit950f4b40bfc05db37d91d960cda163f557dd5e50 (patch)
tree0b198880536d57ad0e5f199feba20e2c40682a76 /qpid/cpp/src/CMakeLists.txt
parenta420d41e0c1753a6fae347b3980db4bd11a24cc7 (diff)
downloadqpid-python-950f4b40bfc05db37d91d960cda163f557dd5e50.tar.gz
Removed the Visual Studio solution/project files, as these are now generated by CMake. Added CMakeLists.txt files to Makefile.am, and all other needed support files so that the 'make dist' supplies all needed items for building a release kit on Windows. Fixes QPID-2134
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@882373 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
-rw-r--r--qpid/cpp/src/CMakeLists.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 3f8504dcff..907dc0e71e 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -92,14 +92,16 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} ${mgen_dir}/qmf-gen -c managementge
message(STATUS "No need to generate Qpid Management Framework sources")
endif (regen_mgmt)
+ # Pull in the names of the generated files, i.e. ${rgen_framing_srcs}
+ include (${CMAKE_CURRENT_BINARY_DIR}/rubygen.cmake)
+ include (${CMAKE_CURRENT_BINARY_DIR}/managementgen.cmake)
+
else (EXISTS ${AMQP_SPEC})
- message(STATUS "No AMQP spec... won't generate sources")
+ message(STATUS "No AMQP spec... presume generated sources are included")
+ include (rubygen.cmake)
+ include (managementgen.cmake)
endif (EXISTS ${AMQP_SPEC})
-# Pull in the names of the generated files, i.e. ${rgen_framing_srcs}
-include (${CMAKE_CURRENT_BINARY_DIR}/rubygen.cmake)
-include (${CMAKE_CURRENT_BINARY_DIR}/managementgen.cmake)
-
find_program(HELP2MAN help2man DOC "Location of the help2man program")
option(GEN_MANPAGES "Use help2man to generate man pages" ON)
if (GEN_MANPAGES AND NOT HELP2MAN)
@@ -513,7 +515,6 @@ set (qpidcommon_SOURCES
qpid/framing/AMQHeaderBody.cpp
qpid/framing/AMQHeartbeatBody.cpp
qpid/framing/Array.cpp
- qpid/framing/BodyHolder.cpp
qpid/framing/BodyHandler.cpp
qpid/framing/Buffer.cpp
qpid/framing/Endian.cpp