mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	build-system: remove building Grantlee from build script
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									51c84b3c44
								
							
						
					
					
						commit
						2dd28e3c8d
					
				
					 1 changed files with 0 additions and 20 deletions
				
			
		| 
						 | 
				
			
			@ -154,7 +154,6 @@ fi
 | 
			
		|||
# normally this script builds the desktop version in subsurface/build
 | 
			
		||||
# if the first argument is "-mobile" then build Subsurface-mobile in "$BUILD_PREFIX"build-mobile
 | 
			
		||||
# if the first argument is "-both" then build both in subsurface/build and "$BUILD_PREFIX"build-mobile
 | 
			
		||||
BUILDGRANTLEE=0
 | 
			
		||||
 | 
			
		||||
if [ "$BUILD_MOBILE" = "1" ] ; then
 | 
			
		||||
	echo "building Subsurface-mobile in ${SRC_DIR}/build-mobile"
 | 
			
		||||
| 
						 | 
				
			
			@ -171,9 +170,6 @@ if [ "$BUILD_DESKTOP" = "1" ] ; then
 | 
			
		|||
	BUILDDIRS+=( "${BUILD_PREFIX}build" )
 | 
			
		||||
	if [ "$BUILD_WITH_WEBKIT" = "1" ] ; then
 | 
			
		||||
		PRINTING="-DNO_PRINTING=OFF"
 | 
			
		||||
		if [ "$QUICK" != "1" ] ; then
 | 
			
		||||
			BUILDGRANTLEE=1
 | 
			
		||||
		fi
 | 
			
		||||
	else
 | 
			
		||||
		PRINTING="-DNO_PRINTING=ON"
 | 
			
		||||
	fi
 | 
			
		||||
| 
						 | 
				
			
			@ -486,22 +482,6 @@ else
 | 
			
		|||
	EXTRA_OPTS="-DNO_USERMANUAL=ON"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if [ "$BUILDGRANTLEE" = "1" ] ; then
 | 
			
		||||
	# build grantlee
 | 
			
		||||
	cd "$SRC"
 | 
			
		||||
	./${SRC_DIR}/scripts/get-dep-lib.sh single . grantlee
 | 
			
		||||
	pushd grantlee
 | 
			
		||||
	mkdir -p build
 | 
			
		||||
	cd build
 | 
			
		||||
	cmake "$OLDER_MAC_CMAKE" -DCMAKE_BUILD_TYPE="$DEBUGRELEASE" \
 | 
			
		||||
		-DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" \
 | 
			
		||||
		-DBUILD_TESTS=NO \
 | 
			
		||||
		"$SRC"/grantlee
 | 
			
		||||
	make -j4
 | 
			
		||||
	make install
 | 
			
		||||
	popd
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if [ "$QUICK" != "1" ] ; then
 | 
			
		||||
	# build the googlemaps map plugin
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue