Change build path.txt to be more unique

NathanW2 · NathanW2 · commit bb8e47fc84d5 · 2013-06-16T22:45:39.000+10:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -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;
   }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ void QgsApplication::init( QString customConfigPath )`
`96`	`96`	`// "/../../.." is for Mac bundled app in build directory`
`97`	`97`	`foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." )`
`98`	`98`	`{`
`99`		`- f.setFileName( prefixPath + path + "/path.txt" );`
	`99`	`+ f.setFileName( prefixPath + path + "/qgisbuildpath.txt" );`
`100`	`100`	`if ( f.exists() )`
`101`	`101`	`break;`
`102`	`102`	`}`