mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Adapt build.sh if qmake is already in PATH on a Mac
Some people (like me) have Qt elsewhere. So long as qmake is in PATH, we should be able to support it. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									f690a98228
								
							
						
					
					
						commit
						6bfb1f5200
					
				
					 1 changed files with 5 additions and 1 deletions
				
			
		|  | @ -174,7 +174,11 @@ if [ $BUILDMARBLE = 1 ]; then | ||||||
| 	mkdir -p build | 	mkdir -p build | ||||||
| 	cd build | 	cd build | ||||||
| 	if [ $PLATFORM = Darwin ] ; then | 	if [ $PLATFORM = Darwin ] ; then | ||||||
| 		if [ -d "$HOME/Qt/5.8" ] ; then | 		# qmake in PATH? | ||||||
|  | 		libdir=`qmake -query QT_INSTALL_LIBS` | ||||||
|  | 		if [ $? -eq 0 ]; then | ||||||
|  | 			export CMAKE_PREFIX_PATH=$libdir/cmake | ||||||
|  | 		elif [ -d "$HOME/Qt/5.8" ] ; then | ||||||
| 			export CMAKE_PREFIX_PATH=~/Qt/5.8/clang_64/lib/cmake | 			export CMAKE_PREFIX_PATH=~/Qt/5.8/clang_64/lib/cmake | ||||||
| 		elif [ -d "$HOME/Qt/5.7" ] ; then | 		elif [ -d "$HOME/Qt/5.7" ] ; then | ||||||
| 			export CMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/lib/cmake | 			export CMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/lib/cmake | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue