Skip to content
Permalink
Browse files

Change build path.txt to be more unique

  • Loading branch information
NathanW2 committed Jun 16, 2013
1 parent e3608db commit bb8e47fc84d540f451b677815fedd6fdcdbc16d3
Showing with 2 additions and 2 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 src/core/qgsapplication.cpp
@@ -528,7 +528,7 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIB_SUBDIR})

# write a marker with source directory path into the output's bin directory
# if run from the build directory QGIS will detect it and alter the paths
FILE(WRITE ${QGIS_OUTPUT_DIRECTORY}/${QGIS_BIN_SUBDIR}/path.txt "${CMAKE_SOURCE_DIR}\n${QGIS_OUTPUT_DIRECTORY}")
FILE(WRITE ${QGIS_OUTPUT_DIRECTORY}/${QGIS_BIN_SUBDIR}/qgisbuildpath.txt "${CMAKE_SOURCE_DIR}\n${QGIS_OUTPUT_DIRECTORY}")

# manual page - makes sense only on unix systems
IF (UNIX AND NOT APPLE)
@@ -96,7 +96,7 @@ void QgsApplication::init( QString customConfigPath )
// "/../../.." is for Mac bundled app in build directory
foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
{
f.setFileName( prefixPath + path + "/path.txt" );
f.setFileName( prefixPath + path + "/qgisbuildpath.txt" );
if ( f.exists() )
break;
}

0 comments on commit bb8e47f

Please sign in to comment.
You can’t perform that action at this time.