Change build path.txt to be more unique

qgis · Jun 16, 2013 · bb8e47f · bb8e47f
1 parent e3608db
commit bb8e47f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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;
   }