Remove bogus flags from cmStandardIncludes and make complex test pass
This commit is contained in:
parent
62314ea808
commit
b133b832fd
|
@ -24,11 +24,9 @@
|
||||||
#define CMAKE_TO_STRING(x) CMAKE_TO_STRING0(x)
|
#define CMAKE_TO_STRING(x) CMAKE_TO_STRING0(x)
|
||||||
#define CMAKE_TO_STRING0(x) #x
|
#define CMAKE_TO_STRING0(x) #x
|
||||||
|
|
||||||
// include configure generated header to define
|
// include configure generated header to define CMAKE_NO_ANSI_STREAM_HEADERS,
|
||||||
// CMAKE_NO_ANSI_STREAM_HEADERS and CMAKE_NO_STD_NAMESPACE
|
// CMAKE_NO_STD_NAMESPACE, and other macros.
|
||||||
#if defined(CMAKE_HAS_AUTOCONF) || defined(CMAKE_BUILD_WITH_CMAKE)
|
|
||||||
#include "cmConfigure.h"
|
#include "cmConfigure.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CMake_VERSION_STRING \
|
#define CMake_VERSION_STRING \
|
||||||
CMAKE_TO_STRING(CMake_VERSION_MAJOR) "." \
|
CMAKE_TO_STRING(CMake_VERSION_MAJOR) "." \
|
||||||
|
|
|
@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${Complex_SOURCE_DIR}/Library
|
${Complex_SOURCE_DIR}/Library
|
||||||
${Complex_SOURCE_DIR}/../../Source
|
${Complex_SOURCE_DIR}/../../Source
|
||||||
|
${Complex_BINARY_DIR}/../../Source
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(BEFORE
|
INCLUDE_DIRECTORIES(BEFORE
|
||||||
|
|
|
@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${Complex_SOURCE_DIR}/Library
|
${Complex_SOURCE_DIR}/Library
|
||||||
${Complex_SOURCE_DIR}/../../Source
|
${Complex_SOURCE_DIR}/../../Source
|
||||||
|
${Complex_BINARY_DIR}/../../Source
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(BEFORE
|
INCLUDE_DIRECTORIES(BEFORE
|
||||||
|
|
|
@ -56,6 +56,7 @@ LOAD_CACHE(${Complex_SOURCE_DIR}/Cache
|
||||||
INCLUDE_DIRECTORIES(
|
INCLUDE_DIRECTORIES(
|
||||||
${Complex_SOURCE_DIR}/Library
|
${Complex_SOURCE_DIR}/Library
|
||||||
${Complex_SOURCE_DIR}/../../Source
|
${Complex_SOURCE_DIR}/../../Source
|
||||||
|
${Complex_BINARY_DIR}/../../Source
|
||||||
)
|
)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(BEFORE
|
INCLUDE_DIRECTORIES(BEFORE
|
||||||
|
|
Loading…
Reference in New Issue