summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-09-08 14:40:39 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-09-08 14:40:39 (GMT)
commitcc48ba875fd253c5e2a382d876e16189579f49cb (patch)
tree5d2de90d38e616d3ae3f2f0829f959081efd18c2
parent4f5008d76010ff162662126357a1936b055b8ada (diff)
Fix logic handling in KF5AkonadiMacros.cmake
-rw-r--r--KF5AkonadiMacros.cmake9
1 files changed, 3 insertions, 6 deletions
diff --git a/KF5AkonadiMacros.cmake b/KF5AkonadiMacros.cmake
index b747c66..9e35c3c 100644
--- a/KF5AkonadiMacros.cmake
+++ b/KF5AkonadiMacros.cmake
@@ -63,8 +63,7 @@ macro(add_akonadi_isolated_test_advanced _source _additionalsources _linklibrari
set( SQLITE_EXTRA_OPTIONS -xml -o ${TEST_RESULT_OUTPUT_PATH}/sqlite-${_name}.xml )
endif()
- if ((NOT KDEPIMLIBS_RUN_MYSQL_ISOLATED_TESTS AND NOT AKONADI_RUN_MYSQL_ISOLATED_TESTS)
- OR ${KDEPIMLIBS_RUN_MYSQL_ISOLATED_TESTS} OR ${AKONADI_RUN_MYSQL_ISOLATED_TESTS})
+ if (NOT DEFINED AKONADI_RUN_MYSQL_ISOLATED_TESTS OR AKONADI_RUN_MYSQL_ISOLATED_TESTS)
find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin )
if ( MYSQLD_EXECUTABLE )
add_test( NAME akonadi-mysql-fs-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable}
@@ -72,8 +71,7 @@ macro(add_akonadi_isolated_test_advanced _source _additionalsources _linklibrari
endif()
endif()
- if ((NOT KDEPIMLIBS_RUN_PGSQL_ISOLATED_TESTS AND NOT AKONADI_RUN_PGSQL_ISOLATED_TESTS)
- OR ${KDEPIMLIBS_RUN_PGSQL_ISOLATED_TESTS} OR ${AKONADI_RUN_PGSQL_ISOLATED_TESTS})
+ if (NOT DEFINED AKONADI_RUN_PGSQL_ISOLATED_TESTS OR AKONADI_RUN_PGSQL_ISOLATED_TESTS)
find_program( POSTGRES_EXECUTABLE postgres )
if ( POSTGRES_EXECUTABLE )
add_test( NAME akonadi-postgresql-fs-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable}
@@ -81,8 +79,7 @@ macro(add_akonadi_isolated_test_advanced _source _additionalsources _linklibrari
endif()
endif()
- if ((NOT KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS AND NOT AKONADI_RUN_SQLITE_ISOLATED_TESTS)
- OR ${KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS} OR ${AKONADI_RUN_SQLITE_ISOLATED_TESTS})
+ if (NOT DEFINED AKONADI_RUN_SQLITE_ISOLATED_TESTS OR AKONADI_RUN_SQLITE_ISOLATED_TESTS)
add_test( NAME akonadi-sqlite-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable}
${SQLITE_EXTRA_OPTIONS} )
endif()