summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-08-17 13:41:08 +0200
committerMontel Laurent <[email protected]>2017-08-17 13:41:08 +0200
commitd628af4462ae739015f903340df83228eda91696 (patch)
tree663dc9bee1518b6611655bcd63601383ae0e42aa
parent21db51846c7769c44efec2fedc99d74a02e868bd (diff)
Make run without install them
-rw-r--r--CMakeLists.txt10
-rw-r--r--autotests/CMakeLists.txt2
2 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c04fbde..fe419fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,15 @@ project(akonadiconsole)
cmake_minimum_required(VERSION 3.1)
set(KF5_VERSION "5.37.0")
-find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
+option(RUN_UNINSTALL "test run uninstalled apps (experimental)" FALSE)
+
+set(ECM_VERSION ${KF5_VERSION})
+# ECM setup
+if (RUN_UNINSTALL)
+ set(ECM_VERSION "5.38.0")
+endif()
+
+find_package(ECM ${ECM_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(ECMInstallIcons)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index e5a624c..4df042e 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,7 +3,7 @@ macro(add_unittest _source _additionalsource)
set(_test ${_source} ${_additionalsource})
get_filename_component(_name ${_source} NAME_WE)
add_executable( ${_name} ${_test} )
- add_test( ${_name} ${_name} )
+ add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(akonadiconsole-${_name})
set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=1;QT_NO_CPU_FEATURE=sse4.2")
target_link_libraries( ${_name}