From bb8e47fc84d540f451b677815fedd6fdcdbc16d3 Mon Sep 17 00:00:00 2001 From: Nathan Woodrow Date: Sun, 16 Jun 2013 22:42:44 +1000 Subject: [PATCH] Change build path.txt to be more unique --- CMakeLists.txt | 2 +- src/core/qgsapplication.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 592ec5755535..78d567bc7e4d 100644 --- 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 index 2dd32b4f7df4..ccdf5ec6c3e8 100644 --- 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; }