mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't build kirigami in the source tree

Browse source 
Instead build it in its own build tree, where it belongs.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-08-14 08:03:50 -07:00
parent 24718adfc3
commit af282a6061
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -240,7 +240,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
endif() endif()
ADD_LIBRARY(kirigami_static_library STATIC IMPORTED) ADD_LIBRARY(kirigami_static_library STATIC IMPORTED)
SET_TARGET_PROPERTIES(kirigami_static_library PROPERTIES 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( target_link_libraries(
${SUBSURFACE_TARGET} ${SUBSURFACE_TARGET}
subsurface_profile subsurface_profile

9
scripts/build.sh
View file

@ -232,13 +232,10 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do
if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then
cd $SRC/subsurface cd $SRC/subsurface
bash ./scripts/mobilecomponents.sh bash ./scripts/mobilecomponents.sh
mkdir -p $SRC/kirigami-build
cd $SRC/subsurface/mobile-widgets/qml/kirigami/ cd $SRC/kirigami-build
mkdir -p build cmake $SRC/subsurface/mobile-widgets/qml/kirigami/ -DSTATIC_LIBRARY=ON
cd build
cmake .. -DSTATIC_LIBRARY=ON
make -j4 make -j4
make install
fi fi
mkdir -p $SRC/subsurface/$BUILDDIR mkdir -p $SRC/subsurface/$BUILDDIR