diff --git a/tests/Harmattan/TestApps/creds/CMakeLists.txt b/tests/Harmattan/TestApps/creds/CMakeLists.txt index 30af831..e0410f9 100644 --- a/tests/Harmattan/TestApps/creds/CMakeLists.txt +++ b/tests/Harmattan/TestApps/creds/CMakeLists.txt @@ -1,12 +1,17 @@ -set(SRC creds_test.cpp) +if ($ENV{MEEGO}) + # Do nothing +endif ($ENV{MEEGO}) -link_libraries(${MEEGOTOUCH_LIBRARIES}) +if ($ENV{HARMATTAN}) + set(SRC creds_test.cpp) -include(${QT_USE_FILE}) + link_libraries(${MEEGOTOUCH_LIBRARIES}) -# Use the compiler and linker flags given in meegotouch-boostable.pc -# in the source tree. -execute_process(COMMAND "env" + include(${QT_USE_FILE}) + + # Use the compiler and linker flags given in meegotouch-boostable.pc + # in the source tree. + execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--cflags" @@ -14,23 +19,25 @@ execute_process(COMMAND "env" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE booster_cflags OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND "env" + execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--libs" "meegotouch-boostable" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE booster_libs OUTPUT_STRIP_TRAILING_WHITESPACE) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${booster_cflags}") -set(CMAKE_EXE_LINKER_FLAGS ${booster_libs}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${booster_cflags}") + set(CMAKE_EXE_LINKER_FLAGS ${booster_libs}) + + add_executable(creds_test ${SRC}) -add_executable(creds_test ${SRC}) + # max creds + install(PROGRAMS creds_test DESTINATION /usr/bin RENAME fala_ft_creds1.launch) + install(PROGRAMS fala_ft_creds DESTINATION /usr/bin RENAME fala_ft_creds1) -# max creds -install(PROGRAMS creds_test DESTINATION /usr/bin RENAME fala_ft_creds1.launch) -install(PROGRAMS fala_ft_creds DESTINATION /usr/bin RENAME fala_ft_creds1) + # "normal" creds + install(PROGRAMS creds_test DESTINATION /usr/bin RENAME fala_ft_creds2.launch) + install(PROGRAMS fala_ft_creds DESTINATION /usr/bin RENAME fala_ft_creds2) -# "normal" creds -install(PROGRAMS creds_test DESTINATION /usr/bin RENAME fala_ft_creds2.launch) -install(PROGRAMS fala_ft_creds DESTINATION /usr/bin RENAME fala_ft_creds2) +endif ($ENV{HARMATTAN}) diff --git a/tests/Harmattan/TestScripts/CMakeLists.txt b/tests/Harmattan/TestScripts/CMakeLists.txt index 6726d88..6cf22d3 100644 --- a/tests/Harmattan/TestScripts/CMakeLists.txt +++ b/tests/Harmattan/TestScripts/CMakeLists.txt @@ -1,19 +1,25 @@ -install(FILES - test-perf-mbooster.py - check_pipes.py - test-func-launcher.py - utils.py - test-security.py - DESTINATION /usr/share/applauncherd-testscripts) +if ($ENV{MEEGO}) + # Do nothing +endif ($ENV{MEEGO}) -install(PROGRAMS - ts_prestartapp.rb - tc_theming.rb - get-coordinates.rb - test-perf.rb - fala_wid - fala_xres_wl - fala_xres_wol - DESTINATION /usr/share/applauncherd-testscripts) +if ($ENV{HARMATTAN}) + install(FILES + test-perf-mbooster.py + check_pipes.py + test-func-launcher.py + utils.py + test-security.py + DESTINATION /usr/share/applauncherd-testscripts) -add_subdirectory (signal-forward) + install(PROGRAMS + ts_prestartapp.rb + tc_theming.rb + get-coordinates.rb + test-perf.rb + fala_wid + fala_xres_wl + fala_xres_wol + DESTINATION /usr/share/applauncherd-testscripts) + + add_subdirectory (signal-forward) +endif ($ENV{HARMATTAN}) diff --git a/tests/Harmattan/art-tests/CMakeLists.txt b/tests/Harmattan/art-tests/CMakeLists.txt index 4bb9a11..a9f2e20 100644 --- a/tests/Harmattan/art-tests/CMakeLists.txt +++ b/tests/Harmattan/art-tests/CMakeLists.txt @@ -1,2 +1,7 @@ -install(FILES tests.xml DESTINATION /usr/share/applauncherd-art-tests) +if ($ENV{MEEGO}) + # Do nothing +endif ($ENV{MEEGO}) +if ($ENV{HARMATTAN}) + install(FILES tests.xml DESTINATION /usr/share/applauncherd-art-tests) +endif ($ENV{HARMATTAN}) diff --git a/tests/Harmattan/bug-tests/CMakeLists.txt b/tests/Harmattan/bug-tests/CMakeLists.txt index 5ffa8d3..1aeecec 100644 --- a/tests/Harmattan/bug-tests/CMakeLists.txt +++ b/tests/Harmattan/bug-tests/CMakeLists.txt @@ -1,2 +1,8 @@ -install(FILES tests.xml DESTINATION /usr/share/applauncherd-bug-tests) +if ($ENV{MEEGO}) + # Do nothing +endif ($ENV{MEEGO}) + +if ($ENV{HARMATTAN}) + install(FILES tests.xml DESTINATION /usr/share/applauncherd-bug-tests) +endif ($ENV{HARMATTAN}) diff --git a/tests/Harmattan/functests/CMakeLists.txt b/tests/Harmattan/functests/CMakeLists.txt index 20fe457..296a392 100644 --- a/tests/Harmattan/functests/CMakeLists.txt +++ b/tests/Harmattan/functests/CMakeLists.txt @@ -1,2 +1,7 @@ -install(FILES tests.xml DESTINATION /usr/share/applauncherd-functional-tests) +if ($ENV{MEEGO}) + # Do nothing +endif ($ENV{MEEGO}) +if ($ENV{HARMATTAN}) + install(FILES tests.xml DESTINATION /usr/share/applauncherd-functional-tests) +endif ($ENV{HARMATTAN}) diff --git a/tests/Harmattan/perftests/CMakeLists.txt b/tests/Harmattan/perftests/CMakeLists.txt index ddb9857..ecb5715 100644 --- a/tests/Harmattan/perftests/CMakeLists.txt +++ b/tests/Harmattan/perftests/CMakeLists.txt @@ -1 +1,7 @@ -install(FILES tests.xml DESTINATION /usr/share/applauncherd-performance-tests/) +if ($ENV{HARMATTAN}) + install(FILES tests.xml DESTINATION /usr/share/applauncherd-performance-tests/) +endif ($ENV{HARMATTAN}) + +if ($ENV{MEEGO}) + # Do nothing +endif ($ENV{MEEGO})