aiden
/
appmotor
mirror of https://github.com/cutefishos/appmotor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into my-master

Browse Source
pull/1/head
Jussi Lind 15 years ago
parent d395ab9262 eebd14ae1c
commit 0888e4dd00
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File

3
data/pkgconfig/DO-NOT-MOVE
Unescape Escape View File

@ -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.

4
tests/TestApps/creds/CMakeLists.txt
Unescape Escape View File

@ -6,7 +6,7 @@ include(${QT_USE_FILE})
# Use the compiler and linker flags given in meegotouch-boostable.pc # Use the compiler and linker flags given in meegotouch-boostable.pc
# in the source tree. # in the source tree.
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "/usr/bin/pkg-config"
"--cflags" "--cflags"
@ -14,7 +14,7 @@ execute_process(COMMAND "/bin/env"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE booster_cflags OUTPUT_VARIABLE booster_cflags
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "--libs" "/usr/bin/pkg-config" "--libs"
"meegotouch-boostable" "meegotouch-boostable"

4
tests/TestApps/helloworld/CMakeLists.txt
Unescape Escape View File

@ -7,7 +7,7 @@ include(${QT_USE_FILE})
# Use the compiler and linker flags given in meegotouch-boostable.pc # Use the compiler and linker flags given in meegotouch-boostable.pc
# in the source tree. # in the source tree.
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "/usr/bin/pkg-config"
"--cflags" "--cflags"
@ -15,7 +15,7 @@ execute_process(COMMAND "/bin/env"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE booster_cflags OUTPUT_VARIABLE booster_cflags
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "--libs" "/usr/bin/pkg-config" "--libs"
"meegotouch-boostable" "meegotouch-boostable"

4
tests/TestApps/testapp/CMakeLists.txt
Unescape Escape View File

@ -4,7 +4,7 @@ link_libraries(${MEEGOTOUCH_LIBRARIES})
# Use the compiler and linker flags given in meegotouch-boostable.pc # Use the compiler and linker flags given in meegotouch-boostable.pc
# in the source tree. # in the source tree.
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "/usr/bin/pkg-config"
"--cflags" "--cflags"
@ -12,7 +12,7 @@ execute_process(COMMAND "/bin/env"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE booster_cflags OUTPUT_VARIABLE booster_cflags
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "--libs" "/usr/bin/pkg-config" "--libs"
"meegotouch-boostable" "meegotouch-boostable"

4
tests/TestApps/themetest/src/CMakeLists.txt
Unescape Escape View File

@ -7,7 +7,7 @@ include(${QT_USE_FILE})
# Use the compiler and linker flags given in meegotouch-boostable.pc # Use the compiler and linker flags given in meegotouch-boostable.pc
# in the source tree. # in the source tree.
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "/usr/bin/pkg-config"
"--cflags" "--cflags"
@ -15,7 +15,7 @@ execute_process(COMMAND "/bin/env"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE booster_cflags OUTPUT_VARIABLE booster_cflags
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND "/bin/env" execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig" "PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "--libs" "/usr/bin/pkg-config" "--libs"
"meegotouch-boostable" "meegotouch-boostable"

Write Preview
Loading…
Cancel
Save