diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-11-06 12:12:55 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-11-06 12:12:55 +0100 |
| commit | a89e450181385d2916f5cef1a9523eb065c7d4d7 (patch) | |
| tree | b665b07d4f88e0a2b6fb13ccca86ef3347da7db2 /cmake | |
| parent | b0286eed76fad290b72be99ab5ad574f00cc14c8 (diff) | |
| parent | 008264ff558d7a693ffcb098832de62320574d79 (diff) | |
Merge branch 'dbus-1.10'
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/test/CMakeLists.txt | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 1a12f5a8..eb4b1f10 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -122,8 +122,8 @@ set (TESTDIRS test/data/valid-config-files test/data/valid-config-files/basic.d test/data/valid-config-files/session.d - test/data/valid-config-files/system.d test/data/valid-config-files-system + test/data/valid-config-files-system/system.d test/data/valid-introspection-files test/data/valid-messages test/data/valid-service-files @@ -140,13 +140,16 @@ set (TESTDIRS ) set (CONFIG_VERBOSE 0) +FOREACH(DIR ${TESTDIRS}) + FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR}) +ENDFOREACH(DIR) + ### copy tests to builddir so that generated tests and static tests ### are all in one place. MESSAGE(STATUS "Copying test files to test directory") FOREACH(FILE_TYPE *.message *.message-raw *.auth-script *.sha1 *.txt *.conf *.service) FOREACH(DIR ${TESTDIRS}) FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" ) - FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR}) FOREACH(FILE ${FILES}) GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME) SET (TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME}) @@ -164,7 +167,6 @@ MESSAGE(STATUS "Generating test files from templates into test directory") FOREACH(FILE_TYPE *.conf.in *.service.in) FOREACH(DIR ${TESTDIRS}) FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../${DIR}/${FILE_TYPE}" ) - FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR}) FOREACH(FILE ${FILES}) GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME) STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME}) @@ -178,19 +180,5 @@ FOREACH(FILE_TYPE *.conf.in *.service.in) ENDFOREACH(FILE_TYPE) MESSAGE(STATUS "Copying generated bus config files to test directory") -set (OUTDIR ${CMAKE_BINARY_DIR}/test/data/valid-config-files) - -SET(FILES - "${CMAKE_SOURCE_DIR}/../bus/session.conf.in" - "${CMAKE_SOURCE_DIR}/../bus/system.conf.in" -) -FILE(MAKE_DIRECTORY ${OUTDIR}) -FOREACH(FILE ${FILES}) - GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME) - STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME}) - SET (TARGET ${OUTDIR}/${FILENAME}) - configure_file(${FILE} ${TARGET} @ONLY) - IF (CONFIG_VERBOSE) - MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n") - ENDIF (CONFIG_VERBOSE) -ENDFOREACH(FILE) +configure_file("${CMAKE_SOURCE_DIR}/../bus/session.conf.in" ${CMAKE_BINARY_DIR}/test/data/valid-config-files/session.conf @ONLY) +configure_file("${CMAKE_SOURCE_DIR}/../bus/system.conf.in" ${CMAKE_BINARY_DIR}/test/data/valid-config-files-system/system.conf @ONLY) |