diff options
| author | Charles E. Rolke <chug@apache.org> | 2013-01-10 20:57:50 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2013-01-10 20:57:50 +0000 |
| commit | 18c61825e6e23b0b48972028670178b48d1b5f8b (patch) | |
| tree | 289963806b2e58c26bd42acbda96f0e4e9fb14de /qpid/cpp/src/tests | |
| parent | ae68a3eb895428cc564868c6c6a8e4e1b9464baa (diff) | |
| download | qpid-python-18c61825e6e23b0b48972028670178b48d1b5f8b.tar.gz | |
QPID-1726 ASF licensed QPID store - reenable in build
Add new legacystore.cmake to EXTRA_DIST in makefile suite.
Fix cmake scripts for core library and tests.
Note: Tests are not truly integrated. Four standalone unit tests are starters for proving functionality.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1431635 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/legacystore/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt index d3ba1f5b65..815b6d1dd6 100644 --- a/qpid/cpp/src/tests/CMakeLists.txt +++ b/qpid/cpp/src/tests/CMakeLists.txt @@ -348,4 +348,4 @@ add_library (dlclose_noop MODULE dlclose_noop.c) # # legacystore # -#add_subdirectory(legacystore) +add_subdirectory(legacystore) diff --git a/qpid/cpp/src/tests/legacystore/CMakeLists.txt b/qpid/cpp/src/tests/legacystore/CMakeLists.txt index f4bed53ad0..6cfaa7ec17 100644 --- a/qpid/cpp/src/tests/legacystore/CMakeLists.txt +++ b/qpid/cpp/src/tests/legacystore/CMakeLists.txt @@ -17,6 +17,10 @@ # under the License. # +if(BUILD_LEGACYSTORE) + +message(STATUS "Building legacystore tests") + # Enable dashboard reporting. include (CTest) @@ -109,3 +113,5 @@ if (PYTHON_EXECUTABLE) execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --prefix=${pythoon_bld} --install-lib=${python_bld} --install-scripts=${python_bld}/commands WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../python) endif (PYTHON_EXECUTABLE) + +endif (BUILD_LEGACYSTORE) |