From 416afb7d5ab573c53af9910fbbba53cd75aa4167 Mon Sep 17 00:00:00 2001 From: Sebastien Barre Date: Tue, 22 Jan 2002 15:50:52 -0500 Subject: ENH: Move CMakeCache.txt to Cache/ directory to avoid any in-source build pb. --- Tests/Complex/CMakeCache.txt | 34 ------------------------- Tests/Complex/CMakeLists.txt | 2 +- Tests/Complex/Cache/CMakeCache.txt | 34 +++++++++++++++++++++++++ Tests/ComplexOneConfig/CMakeCache.txt | 34 ------------------------- Tests/ComplexOneConfig/CMakeLists.txt | 2 +- Tests/ComplexOneConfig/Cache/CMakeCache.txt | 34 +++++++++++++++++++++++++ Tests/ComplexRelativePaths/CMakeCache.txt | 34 ------------------------- Tests/ComplexRelativePaths/CMakeLists.txt | 2 +- Tests/ComplexRelativePaths/Cache/CMakeCache.txt | 34 +++++++++++++++++++++++++ 9 files changed, 105 insertions(+), 105 deletions(-) delete mode 100644 Tests/Complex/CMakeCache.txt create mode 100644 Tests/Complex/Cache/CMakeCache.txt delete mode 100644 Tests/ComplexOneConfig/CMakeCache.txt create mode 100644 Tests/ComplexOneConfig/Cache/CMakeCache.txt delete mode 100644 Tests/ComplexRelativePaths/CMakeCache.txt create mode 100644 Tests/ComplexRelativePaths/Cache/CMakeCache.txt diff --git a/Tests/Complex/CMakeCache.txt b/Tests/Complex/CMakeCache.txt deleted file mode 100644 index 17c55aa..0000000 --- a/Tests/Complex/CMakeCache.txt +++ /dev/null @@ -1,34 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: d:/build/kitware/cmake/CMake-nmake/Tests/Complex -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a varible in the cache. -# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//A var. -CACHE_TEST_VAR1:STRING=foo - -//A var. -CACHE_TEST_VAR2:FILEPATH=bar - -//A var. -CACHE_TEST_VAR3:BOOL=1 - -//A var. -CACHE_TEST_VAR_EXCLUDED:BOOL=1 - - -######################## -# INTERNAL cache entries -######################## - -//A var. -CACHE_TEST_VAR_INTERNAL:INTERNAL=bar diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index fd3a2ba..eaaeed9 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -19,7 +19,7 @@ IF (EXISTS ${Complex_SOURCE_DIR}/VarTests.cmake) INCLUDE(${Complex_SOURCE_DIR}/VarTests.cmake) ENDIF (EXISTS ${Complex_SOURCE_DIR}/VarTests.cmake) -LOAD_CACHE(${Complex_SOURCE_DIR} +LOAD_CACHE(${Complex_SOURCE_DIR}/Cache EXCLUDE CACHE_TEST_VAR_EXCLUDED INCLUDE_INTERNALS diff --git a/Tests/Complex/Cache/CMakeCache.txt b/Tests/Complex/Cache/CMakeCache.txt new file mode 100644 index 0000000..17c55aa --- /dev/null +++ b/Tests/Complex/Cache/CMakeCache.txt @@ -0,0 +1,34 @@ +# This is the CMakeCache file. +# For build in directory: d:/build/kitware/cmake/CMake-nmake/Tests/Complex +# You can edit this file to change values found and used by cmake. +# If you do not want to change any of the values, simply exit the editor. +# If you do want to change a value, simply edit, save, and exit the editor. +# The syntax for the file is as follows: +# KEY:TYPE=VALUE +# KEY is the name of a varible in the cache. +# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. +# VALUE is the current value for the KEY. + +######################## +# EXTERNAL cache entries +######################## + +//A var. +CACHE_TEST_VAR1:STRING=foo + +//A var. +CACHE_TEST_VAR2:FILEPATH=bar + +//A var. +CACHE_TEST_VAR3:BOOL=1 + +//A var. +CACHE_TEST_VAR_EXCLUDED:BOOL=1 + + +######################## +# INTERNAL cache entries +######################## + +//A var. +CACHE_TEST_VAR_INTERNAL:INTERNAL=bar diff --git a/Tests/ComplexOneConfig/CMakeCache.txt b/Tests/ComplexOneConfig/CMakeCache.txt deleted file mode 100644 index 17c55aa..0000000 --- a/Tests/ComplexOneConfig/CMakeCache.txt +++ /dev/null @@ -1,34 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: d:/build/kitware/cmake/CMake-nmake/Tests/Complex -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a varible in the cache. -# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//A var. -CACHE_TEST_VAR1:STRING=foo - -//A var. -CACHE_TEST_VAR2:FILEPATH=bar - -//A var. -CACHE_TEST_VAR3:BOOL=1 - -//A var. -CACHE_TEST_VAR_EXCLUDED:BOOL=1 - - -######################## -# INTERNAL cache entries -######################## - -//A var. -CACHE_TEST_VAR_INTERNAL:INTERNAL=bar diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index fd3a2ba..eaaeed9 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -19,7 +19,7 @@ IF (EXISTS ${Complex_SOURCE_DIR}/VarTests.cmake) INCLUDE(${Complex_SOURCE_DIR}/VarTests.cmake) ENDIF (EXISTS ${Complex_SOURCE_DIR}/VarTests.cmake) -LOAD_CACHE(${Complex_SOURCE_DIR} +LOAD_CACHE(${Complex_SOURCE_DIR}/Cache EXCLUDE CACHE_TEST_VAR_EXCLUDED INCLUDE_INTERNALS diff --git a/Tests/ComplexOneConfig/Cache/CMakeCache.txt b/Tests/ComplexOneConfig/Cache/CMakeCache.txt new file mode 100644 index 0000000..17c55aa --- /dev/null +++ b/Tests/ComplexOneConfig/Cache/CMakeCache.txt @@ -0,0 +1,34 @@ +# This is the CMakeCache file. +# For build in directory: d:/build/kitware/cmake/CMake-nmake/Tests/Complex +# You can edit this file to change values found and used by cmake. +# If you do not want to change any of the values, simply exit the editor. +# If you do want to change a value, simply edit, save, and exit the editor. +# The syntax for the file is as follows: +# KEY:TYPE=VALUE +# KEY is the name of a varible in the cache. +# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. +# VALUE is the current value for the KEY. + +######################## +# EXTERNAL cache entries +######################## + +//A var. +CACHE_TEST_VAR1:STRING=foo + +//A var. +CACHE_TEST_VAR2:FILEPATH=bar + +//A var. +CACHE_TEST_VAR3:BOOL=1 + +//A var. +CACHE_TEST_VAR_EXCLUDED:BOOL=1 + + +######################## +# INTERNAL cache entries +######################## + +//A var. +CACHE_TEST_VAR_INTERNAL:INTERNAL=bar diff --git a/Tests/ComplexRelativePaths/CMakeCache.txt b/Tests/ComplexRelativePaths/CMakeCache.txt deleted file mode 100644 index 17c55aa..0000000 --- a/Tests/ComplexRelativePaths/CMakeCache.txt +++ /dev/null @@ -1,34 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: d:/build/kitware/cmake/CMake-nmake/Tests/Complex -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a varible in the cache. -# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//A var. -CACHE_TEST_VAR1:STRING=foo - -//A var. -CACHE_TEST_VAR2:FILEPATH=bar - -//A var. -CACHE_TEST_VAR3:BOOL=1 - -//A var. -CACHE_TEST_VAR_EXCLUDED:BOOL=1 - - -######################## -# INTERNAL cache entries -######################## - -//A var. -CACHE_TEST_VAR_INTERNAL:INTERNAL=bar diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt index fd3a2ba..eaaeed9 100644 --- a/Tests/ComplexRelativePaths/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/CMakeLists.txt @@ -19,7 +19,7 @@ IF (EXISTS ${Complex_SOURCE_DIR}/VarTests.cmake) INCLUDE(${Complex_SOURCE_DIR}/VarTests.cmake) ENDIF (EXISTS ${Complex_SOURCE_DIR}/VarTests.cmake) -LOAD_CACHE(${Complex_SOURCE_DIR} +LOAD_CACHE(${Complex_SOURCE_DIR}/Cache EXCLUDE CACHE_TEST_VAR_EXCLUDED INCLUDE_INTERNALS diff --git a/Tests/ComplexRelativePaths/Cache/CMakeCache.txt b/Tests/ComplexRelativePaths/Cache/CMakeCache.txt new file mode 100644 index 0000000..17c55aa --- /dev/null +++ b/Tests/ComplexRelativePaths/Cache/CMakeCache.txt @@ -0,0 +1,34 @@ +# This is the CMakeCache file. +# For build in directory: d:/build/kitware/cmake/CMake-nmake/Tests/Complex +# You can edit this file to change values found and used by cmake. +# If you do not want to change any of the values, simply exit the editor. +# If you do want to change a value, simply edit, save, and exit the editor. +# The syntax for the file is as follows: +# KEY:TYPE=VALUE +# KEY is the name of a varible in the cache. +# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. +# VALUE is the current value for the KEY. + +######################## +# EXTERNAL cache entries +######################## + +//A var. +CACHE_TEST_VAR1:STRING=foo + +//A var. +CACHE_TEST_VAR2:FILEPATH=bar + +//A var. +CACHE_TEST_VAR3:BOOL=1 + +//A var. +CACHE_TEST_VAR_EXCLUDED:BOOL=1 + + +######################## +# INTERNAL cache entries +######################## + +//A var. +CACHE_TEST_VAR_INTERNAL:INTERNAL=bar -- cgit v0.12