diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-10 13:09:54 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-11-10 13:09:54 (GMT) |
| commit | 21a59bdc4d4c54af5cd175561f9249d5932434d2 (patch) | |
| tree | e5bebbdc782a736cb717a770bdfdbd17a9001cc4 | |
| parent | 74981c1afda7476713dccd6d731cb744eb356a8b (diff) | |
| download | CMake-21a59bdc4d4c54af5cd175561f9249d5932434d2.zip CMake-21a59bdc4d4c54af5cd175561f9249d5932434d2.tar.gz CMake-21a59bdc4d4c54af5cd175561f9249d5932434d2.tar.bz2 | |
Fix double bootstrap build for in source builds
| -rw-r--r-- | Source/cmStandardIncludes.h | 2 | ||||
| -rwxr-xr-x | bootstrap | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 115dc8c..38347a92 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -18,7 +18,7 @@ // include configure generated header to define CMAKE_NO_ANSI_STREAM_HEADERS, // CMAKE_NO_STD_NAMESPACE, and other macros. -#include "cmConfigure.h" +#include <cmConfigure.h> #include <cmsys/Configure.hxx> #ifdef _MSC_VER @@ -1316,9 +1316,9 @@ if [ "x${cmake_cxx_flags}" != "x" ]; then fi cmake_c_flags_String="-DKWSYS_STRING_C" -cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_source_dir}/Source\"` \ +cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \ -I`cmake_escape \"${cmake_bootstrap_dir}\"`" -cmake_cxx_flags="${cmake_cxx_flags}-I`cmake_escape \"${cmake_source_dir}/Source\"` \ +cmake_cxx_flags="${cmake_cxx_flags} -I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \ -I`cmake_escape \"${cmake_bootstrap_dir}\"`" echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile" echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" |