diff --git a/data/pkgconfig/DO-NOT-MOVE b/data/pkgconfig/DO-NOT-MOVE new file mode 100644 index 0000000..39cf8c2 --- /dev/null +++ b/data/pkgconfig/DO-NOT-MOVE @@ -0,0 +1,3 @@ +Do not move this file unless you modify the CMakeLists.txt files of +the test applications. Building the test applications looks for the +.pc file in this directory. diff --git a/tests/TestApps/creds/CMakeLists.txt b/tests/TestApps/creds/CMakeLists.txt index 7aab421..30af831 100644 --- a/tests/TestApps/creds/CMakeLists.txt +++ b/tests/TestApps/creds/CMakeLists.txt @@ -6,7 +6,7 @@ include(${QT_USE_FILE}) # Use the compiler and linker flags given in meegotouch-boostable.pc # in the source tree. -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--cflags" @@ -14,7 +14,7 @@ execute_process(COMMAND "/bin/env" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE booster_cflags OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--libs" "meegotouch-boostable" diff --git a/tests/TestApps/helloworld/CMakeLists.txt b/tests/TestApps/helloworld/CMakeLists.txt index f548384..d17351a 100644 --- a/tests/TestApps/helloworld/CMakeLists.txt +++ b/tests/TestApps/helloworld/CMakeLists.txt @@ -7,7 +7,7 @@ include(${QT_USE_FILE}) # Use the compiler and linker flags given in meegotouch-boostable.pc # in the source tree. -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--cflags" @@ -15,7 +15,7 @@ execute_process(COMMAND "/bin/env" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE booster_cflags OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--libs" "meegotouch-boostable" diff --git a/tests/TestApps/testapp/CMakeLists.txt b/tests/TestApps/testapp/CMakeLists.txt index dcfc742..dad2b2b 100644 --- a/tests/TestApps/testapp/CMakeLists.txt +++ b/tests/TestApps/testapp/CMakeLists.txt @@ -4,7 +4,7 @@ link_libraries(${MEEGOTOUCH_LIBRARIES}) # Use the compiler and linker flags given in meegotouch-boostable.pc # in the source tree. -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--cflags" @@ -12,7 +12,7 @@ execute_process(COMMAND "/bin/env" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE booster_cflags OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--libs" "meegotouch-boostable" diff --git a/tests/TestApps/themetest/src/CMakeLists.txt b/tests/TestApps/themetest/src/CMakeLists.txt index c1f0b66..e13dfc3 100644 --- a/tests/TestApps/themetest/src/CMakeLists.txt +++ b/tests/TestApps/themetest/src/CMakeLists.txt @@ -7,7 +7,7 @@ include(${QT_USE_FILE}) # Use the compiler and linker flags given in meegotouch-boostable.pc # in the source tree. -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--cflags" @@ -15,7 +15,7 @@ execute_process(COMMAND "/bin/env" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE booster_cflags OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND "/bin/env" +execute_process(COMMAND "env" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "/usr/bin/pkg-config" "--libs" "meegotouch-boostable"