diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-04-28 14:52:20 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-04-28 14:52:20 (GMT) |
| commit | df31c576dcfdbb7b7b9e2ba26498bae5af9f4e93 (patch) | |
| tree | 95aa9860e9e1d3e5b387a14f747a2d82139ba429 | |
| parent | ddf814f964f16b72ed294b099a4c0c9c575efb92 (diff) | |
| download | CMake-df31c576dcfdbb7b7b9e2ba26498bae5af9f4e93.zip CMake-df31c576dcfdbb7b7b9e2ba26498bae5af9f4e93.tar.gz CMake-df31c576dcfdbb7b7b9e2ba26498bae5af9f4e93.tar.bz2 | |
ENH: Add support for automatically preloaded cmake file. Closes Bug #802 - Add auto preload file support in CMake
| -rw-r--r-- | Source/cmake.cxx | 7 | ||||
| -rw-r--r-- | Tests/CommandLineTest/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/CommandLineTest/PreLoad.cmake | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 121e0df..3a4a0d5 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1160,6 +1160,13 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure) cmSystemTools::Error("Problem processing arguments. Aborting.\n"); return -1; } + + std::string pre_load = this->GetHomeDirectory(); + pre_load += "/PreLoad.cmake"; + if ( cmSystemTools::FileExists(pre_load.c_str()) ) + { + this->ReadListFile(pre_load.c_str()); + } std::string systemFile = this->GetHomeOutputDirectory(); systemFile += "/CMakeSystem.cmake"; diff --git a/Tests/CommandLineTest/CMakeLists.txt b/Tests/CommandLineTest/CMakeLists.txt index be36860..73b8a47 100644 --- a/Tests/CommandLineTest/CMakeLists.txt +++ b/Tests/CommandLineTest/CMakeLists.txt @@ -23,3 +23,13 @@ ELSE(DUMP_DOC_EXE) ENDIF(DUMP_DOC_EXE) ADD_EXECUTABLE(CommandLineTest CommandLineTest.cxx) + +IF(THIS_SHOULD_BE_SET) + MESSAGE(STATUS "***************************") + MESSAGE(STATUS "PreLoad.cmake works fine.") + MESSAGE(STATUS "***************************") +ELSE(THIS_SHOULD_BE_SET) + MESSAGE("***************************") + MESSAGE(FATAL_ERROR "PreLoad.cmake does not work.") +ENDIF(THIS_SHOULD_BE_SET) + diff --git a/Tests/CommandLineTest/PreLoad.cmake b/Tests/CommandLineTest/PreLoad.cmake new file mode 100644 index 0000000..87284af --- /dev/null +++ b/Tests/CommandLineTest/PreLoad.cmake @@ -0,0 +1 @@ +SET(THIS_SHOULD_BE_SET ON CACHE BOOL "Some variable") |