diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-08-14 08:03:50 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-08-14 09:35:12 -0700 |
| commit | af282a6061d77d5ac830f20baf5db6dad152dbdd (patch) | |
| tree | 76dcbfdc783107b247ff90dce935e850c204d675 | |
| parent | 24718adfc3c2d7caaddd307289ba69fa706315c9 (diff) | |
| download | subsurface-af282a6061d77d5ac830f20baf5db6dad152dbdd.tar.gz | |
Don't build kirigami in the source tree
Instead build it in its own build tree, where it belongs.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/build.sh | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dea200c36..a824d0364 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,7 +240,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") endif() ADD_LIBRARY(kirigami_static_library STATIC IMPORTED) SET_TARGET_PROPERTIES(kirigami_static_library PROPERTIES - IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/build/src/libkirigamiplugin.a) + IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../kirigami-build/src/libkirigamiplugin.a) target_link_libraries( ${SUBSURFACE_TARGET} subsurface_profile diff --git a/scripts/build.sh b/scripts/build.sh index 635f1b155..989ddbd9a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -232,13 +232,10 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then cd $SRC/subsurface bash ./scripts/mobilecomponents.sh - - cd $SRC/subsurface/mobile-widgets/qml/kirigami/ - mkdir -p build - cd build - cmake .. -DSTATIC_LIBRARY=ON + mkdir -p $SRC/kirigami-build + cd $SRC/kirigami-build + cmake $SRC/subsurface/mobile-widgets/qml/kirigami/ -DSTATIC_LIBRARY=ON make -j4 - make install fi mkdir -p $SRC/subsurface/$BUILDDIR |