Skip to content

Commit d4d5053

Browse files
Refactor: Finish replacing CMAKE_BUILD_WITH_CMAKE with CMAKE_BOOTSTRAP
Remove -DCMAKE_BUILD_WITH_CMAKE from Source/CMakeLists.txt. Remove CMAKE_BOOTSTRAP from bootstrap's cmConfigure.h. Add -DCMAKE_BOOTSTRAP to all bootstrap sources, and remove the Unix specialization of CMAKE_BOOTSTRAP in libuv (a review of the libuv code suggests that this will not have an effect on the Windows build.)
1 parent fe921ed commit d4d5053

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Source/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ include_directories(
9595
${CMake_HAIKU_INCLUDE_DIRS}
9696
)
9797

98-
# let cmake know it is supposed to use it
99-
add_definitions(-DCMAKE_BUILD_WITH_CMAKE)
100-
10198
# Check if we can build the ELF parser.
10299
if(CMAKE_USE_ELF_PARSER)
103100
set(ELF_SRCS cmELF.h cmELF.cxx)

bootstrap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,6 @@ cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_
13621362
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
13631363
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"/bootstrap-not-insalled\""
13641364
cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\""
1365-
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"
13661365
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
13671366

13681367
# Regenerate configured headers
@@ -1408,7 +1407,6 @@ if ${cmake_system_mingw}; then
14081407
uv_c_flags="${uv_c_flags} -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600"
14091408
libs="${libs} -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -lole32 -loleaut32"
14101409
else
1411-
uv_c_flags="${uv_c_flags} -DCMAKE_BOOTSTRAP"
14121410
case "${cmake_system}" in
14131411
*AIX*)
14141412
uv_c_flags="${uv_c_flags} -D_ALL_SOURCE -D_XOPEN_SOURCE=500 -D_LINUX_SOURCE_COMPAT"
@@ -1469,11 +1467,13 @@ cmake_cxx_flags_SystemTools="
14691467
-DKWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES}
14701468
"
14711469
cmake_c_flags="${cmake_c_flags} \
1470+
-DCMAKE_BOOTSTRAP \
14721471
-I`cmake_escape \"${cmake_bootstrap_dir}\"` \
14731472
-I`cmake_escape \"${cmake_source_dir}/Source\"` \
14741473
-I`cmake_escape \"${cmake_source_dir}/Source/LexerParser\"` \
14751474
-I`cmake_escape \"${cmake_source_dir}/Utilities\"`"
14761475
cmake_cxx_flags="${cmake_cxx_flags} \
1476+
-DCMAKE_BOOTSTRAP \
14771477
-I`cmake_escape \"${cmake_bootstrap_dir}\"` \
14781478
-I`cmake_escape \"${cmake_source_dir}/Source\"` \
14791479
-I`cmake_escape \"${cmake_source_dir}/Source/LexerParser\"` \

0 commit comments

Comments
 (0)