diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-03-26 15:45:23 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-03-26 15:45:23 (GMT) |
| commit | b133b832fdcb50bc7bb9dc4bfb0631bb9aa6989e (patch) | |
| tree | eb69b22825a71a13383b0db978398178a6e063e6 | |
| parent | 62314ea808ead384c72a17a29b1d5d04fb9dd647 (diff) | |
| download | CMake-b133b832fdcb50bc7bb9dc4bfb0631bb9aa6989e.zip CMake-b133b832fdcb50bc7bb9dc4bfb0631bb9aa6989e.tar.gz CMake-b133b832fdcb50bc7bb9dc4bfb0631bb9aa6989e.tar.bz2 | |
Remove bogus flags from cmStandardIncludes and make complex test pass
| -rw-r--r-- | Source/cmStandardIncludes.h | 6 | ||||
| -rw-r--r-- | Tests/Complex/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/CMakeLists.txt | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 4204b53..0b3aef5 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -24,11 +24,9 @@ #define CMAKE_TO_STRING(x) CMAKE_TO_STRING0(x) #define CMAKE_TO_STRING0(x) #x -// include configure generated header to define -// CMAKE_NO_ANSI_STREAM_HEADERS and CMAKE_NO_STD_NAMESPACE -#if defined(CMAKE_HAS_AUTOCONF) || defined(CMAKE_BUILD_WITH_CMAKE) +// include configure generated header to define CMAKE_NO_ANSI_STREAM_HEADERS, +// CMAKE_NO_STD_NAMESPACE, and other macros. #include "cmConfigure.h" -#endif #define CMake_VERSION_STRING \ CMAKE_TO_STRING(CMake_VERSION_MAJOR) "." \ diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 54170d0..e6444ab 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache INCLUDE_DIRECTORIES( ${Complex_SOURCE_DIR}/Library ${Complex_SOURCE_DIR}/../../Source + ${Complex_BINARY_DIR}/../../Source ) INCLUDE_DIRECTORIES(BEFORE diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index 54170d0..e6444ab 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache INCLUDE_DIRECTORIES( ${Complex_SOURCE_DIR}/Library ${Complex_SOURCE_DIR}/../../Source + ${Complex_BINARY_DIR}/../../Source ) INCLUDE_DIRECTORIES(BEFORE diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt index 54170d0..e6444ab 100644 --- a/Tests/ComplexRelativePaths/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/CMakeLists.txt @@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache INCLUDE_DIRECTORIES( ${Complex_SOURCE_DIR}/Library ${Complex_SOURCE_DIR}/../../Source + ${Complex_BINARY_DIR}/../../Source ) INCLUDE_DIRECTORIES(BEFORE |