Commit b133b832 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

Remove bogus flags from cmStandardIncludes and make complex test pass

parent 62314ea8
......@@ -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) "." \
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment