diff options
| author | Aleix Pol <aleixpol@kde.org> | 2017-04-11 17:19:21 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2017-04-11 17:19:21 +0200 |
| commit | 1eeae4015bca728160f651f781d73851cc4c43ae (patch) | |
| tree | 301648d1ddfe383cd8578856b1e7503638f3e99e | |
| parent | 78529f4452b2e09d9f579d7723f7cb7634f43e7c (diff) | |
| download | extra-cmake-modules-1eeae4015bca728160f651f781d73851cc4c43ae.tar.gz extra-cmake-modules-1eeae4015bca728160f651f781d73851cc4c43ae.tar.bz2 | |
Don't include tests together with modules
We have tests that go through the modules directory
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | modules/ECMGenerateQmlTypes.cmake | 2 | ||||
| -rw-r--r-- | test-modules/test_execute_and_compare.cmake (renamed from modules/test_execute_and_compare.cmake) | 0 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a209511..a3f47652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,9 @@ endif() file(GLOB installModuleFiles ${CMAKE_SOURCE_DIR}/modules/*[^~]) install(FILES ${installModuleFiles} DESTINATION ${MODULES_INSTALL_DIR}) +file(GLOB installTestModuleFiles ${CMAKE_SOURCE_DIR}/test-modules/*[^~]) +install(FILES ${installTestModuleFiles} DESTINATION ${SHARE_INSTALL_DIR}/ECM/test-modules) + file(GLOB installKdeModuleFiles ${CMAKE_SOURCE_DIR}/kde-modules/*[^~]) install(FILES ${installKdeModuleFiles} DESTINATION ${KDE_MODULES_INSTALL_DIR}) diff --git a/modules/ECMGenerateQmlTypes.cmake b/modules/ECMGenerateQmlTypes.cmake index 0a27b9e1..e403fefd 100644 --- a/modules/ECMGenerateQmlTypes.cmake +++ b/modules/ECMGenerateQmlTypes.cmake @@ -76,7 +76,7 @@ function(ecm_generate_qmltypes) # sometimes qmlplugindump output isn't reproducible, we better have it opt in for now if(ARG_TEST_ENABLED) add_test(NAME ${targetname} COMMAND - cmake -DARG_UNPARSED_ARGUMENTS=${processedArgs} -DKDE_INSTALL_QMLDIR=${KDE_INSTALL_QMLDIR} -DINPUT=${generatedFile} -P ${ECM_MODULE_DIR}/test_execute_and_compare.cmake + cmake -DARG_UNPARSED_ARGUMENTS=${processedArgs} -DKDE_INSTALL_QMLDIR=${KDE_INSTALL_QMLDIR} -DINPUT=${generatedFile} -P ${ECM_MODULE_DIR}/../test-modules/test_execute_and_compare.cmake ) endif() endfunction() diff --git a/modules/test_execute_and_compare.cmake b/test-modules/test_execute_and_compare.cmake index 0f325d95..0f325d95 100644 --- a/modules/test_execute_and_compare.cmake +++ b/test-modules/test_execute_and_compare.cmake |