Refactor internal resource location APIs and initialization
Rename cmSystemTools::FindExecutableDirectory to FindCMakeResources. Teach it to compute the locations of cmake, ctest, cpack, ccmake, and cmake-gui executables, and the location of CMAKE_ROOT. Provide this information from static cmSystemTools::Get<resource>() methods. Refactor code that needs these locations to use the new APIs. Teach FindCMakeResources to use the OS X system API to lookup the executable location. When running from the CMake build tree itself, leave a file in the tree that FindCMakeResources can use to read the location of the source tree. This avoids the need to compile the source tree location into a binary that may be installed and used without the source tree. Teach the QtDialog on OS X to create a "cmake-gui" symlink in the build tree next to "cmake" and the other tools, as is already done in the install tree for the application bundle. This ensures a consistent set of executables are available in one directory.
Showing
- Source/CMakeLists.txt 6 additions, 0 deletionsSource/CMakeLists.txt
- Source/CMakeSourceDir.txt.in 1 addition, 0 deletionsSource/CMakeSourceDir.txt.in
- Source/CPack/cmCPackGenerator.cxx 0 additions, 32 deletionsSource/CPack/cmCPackGenerator.cxx
- Source/CPack/cmCPackGenerator.h 0 additions, 7 deletionsSource/CPack/cmCPackGenerator.h
- Source/CPack/cpack.cxx 1 addition, 2 deletionsSource/CPack/cpack.cxx
- Source/CTest/cmCTestBuildAndTestHandler.cxx 1 addition, 1 deletionSource/CTest/cmCTestBuildAndTestHandler.cxx
- Source/CTest/cmCTestConfigureCommand.cxx 1 addition, 1 deletionSource/CTest/cmCTestConfigureCommand.cxx
- Source/CTest/cmCTestScriptHandler.cxx 4 additions, 4 deletionsSource/CTest/cmCTestScriptHandler.cxx
- Source/CursesDialog/ccmake.cxx 1 addition, 2 deletionsSource/CursesDialog/ccmake.cxx
- Source/CursesDialog/cmCursesMainForm.cxx 2 additions, 2 deletionsSource/CursesDialog/cmCursesMainForm.cxx
- Source/QtDialog/CMakeLists.txt 7 additions, 0 deletionsSource/QtDialog/CMakeLists.txt
- Source/QtDialog/CMakeSetup.cxx 1 addition, 2 deletionsSource/QtDialog/CMakeSetup.cxx
- Source/QtDialog/QCMake.cxx 2 additions, 23 deletionsSource/QtDialog/QCMake.cxx
- Source/cmCTest.cxx 2 additions, 25 deletionsSource/cmCTest.cxx
- Source/cmCTest.h 0 additions, 9 deletionsSource/cmCTest.h
- Source/cmConfigure.cmake.h.in 0 additions, 2 deletionsSource/cmConfigure.cmake.h.in
- Source/cmDocumentation.cxx 3 additions, 2 deletionsSource/cmDocumentation.cxx
- Source/cmDocumentation.h 0 additions, 4 deletionsSource/cmDocumentation.h
- Source/cmGlobalGenerator.cxx 3 additions, 3 deletionsSource/cmGlobalGenerator.cxx
- Source/cmMakefile.cxx 0 additions, 1 deletionSource/cmMakefile.cxx
Loading
Please register or sign in to comment