From 716eb198198f982d3670ce83927e791103d11fc0 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Tue, 27 Aug 2002 08:36:03 -0400 Subject: [PATCH] fixed bootstrap build to not use LoadCOmmandCOmmand --- Source/CMakeLists.txt | 4 ++++ Source/cmCommands.cxx | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index af31977b4..5aa921b9c 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -85,6 +85,10 @@ ADD_EXECUTABLE(cmake cmakemain.cxx) ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation) ADD_EXECUTABLE(ctest ctest.cxx) +IF (UNIX) + TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS}) +ENDIF (UNIX) + TARGET_LINK_LIBRARIES(cmake CMakeLib) TARGET_LINK_LIBRARIES(DumpDocumentation CMakeLib) TARGET_LINK_LIBRARIES(ctest CMakeLib) diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index 28a83e3fe..b60a114a0 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -87,7 +87,13 @@ #include "cmQTWrapUICommand.cxx" #include "cmWrapExcludeFilesCommand.cxx" +// on regular builds add in the load command command +// we do not add it in on the bootstrap because it +// requires dynaic loading support etc, which makes +// the bootstrap configure file a mess +#if defined(CMAKE_BUILD_WITH_CMAKE) #include "cmLoadCommandCommand.cxx" +#endif void GetPredefinedCommands(std::list& commands) { @@ -130,7 +136,9 @@ void GetPredefinedCommands(std::list& commands) commands.push_back(new cmLinkDirectoriesCommand); commands.push_back(new cmLinkLibrariesCommand); commands.push_back(new cmLoadCacheCommand); +#if defined(CMAKE_BUILD_WITH_CMAKE) commands.push_back(new cmLoadCommandCommand); +#endif commands.push_back(new cmMacroCommand); commands.push_back(new cmMakeDirectoryCommand); commands.push_back(new cmMarkAsAdvancedCommand);