kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix apple bootstrap issues

This commit is contained in:
Andy Cedilnik 2006-03-22 13:04:49 -05:00
parent 36e2728431
commit 43b9f184c2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmBootstrapCommands.cxx
View File

@ -43,6 +43,7 @@
#include "cmForEachCommand.cxx" #include "cmForEachCommand.cxx"
#include "cmGetCMakePropertyCommand.cxx" #include "cmGetCMakePropertyCommand.cxx"
#include "cmGetFilenameComponentCommand.cxx" #include "cmGetFilenameComponentCommand.cxx"
#include "cmGetSourceFilePropertyCommand.cxx"
#include "cmIfCommand.cxx" #include "cmIfCommand.cxx"
#include "cmIncludeCommand.cxx" #include "cmIncludeCommand.cxx"
#include "cmIncludeDirectoryCommand.cxx" #include "cmIncludeDirectoryCommand.cxx"
@ -90,6 +91,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands.push_back(new cmForEachCommand); commands.push_back(new cmForEachCommand);
commands.push_back(new cmGetCMakePropertyCommand); commands.push_back(new cmGetCMakePropertyCommand);
commands.push_back(new cmGetFilenameComponentCommand); commands.push_back(new cmGetFilenameComponentCommand);
commands.push_back(new cmGetSourceFilePropertyCommand);
commands.push_back(new cmIfCommand); commands.push_back(new cmIfCommand);
commands.push_back(new cmIncludeCommand); commands.push_back(new cmIncludeCommand);
commands.push_back(new cmIncludeDirectoryCommand); commands.push_back(new cmIncludeDirectoryCommand);

2
Source/cmCommands.cxx
View File

@ -27,7 +27,6 @@
#include "cmExportLibraryDependencies.cxx" #include "cmExportLibraryDependencies.cxx"
#include "cmFLTKWrapUICommand.cxx" #include "cmFLTKWrapUICommand.cxx"
#include "cmGetDirectoryPropertyCommand.cxx" #include "cmGetDirectoryPropertyCommand.cxx"
#include "cmGetSourceFilePropertyCommand.cxx"
#include "cmGetTargetPropertyCommand.cxx" #include "cmGetTargetPropertyCommand.cxx"
#include "cmGetTestPropertyCommand.cxx" #include "cmGetTestPropertyCommand.cxx"
#include "cmIncludeExternalMSProjectCommand.cxx" #include "cmIncludeExternalMSProjectCommand.cxx"
@ -82,7 +81,6 @@ void GetPredefinedCommands(std::list<cmCommand*>&
commands.push_back(new cmExportLibraryDependenciesCommand); commands.push_back(new cmExportLibraryDependenciesCommand);
commands.push_back(new cmFLTKWrapUICommand); commands.push_back(new cmFLTKWrapUICommand);
commands.push_back(new cmGetDirectoryPropertyCommand); commands.push_back(new cmGetDirectoryPropertyCommand);
commands.push_back(new cmGetSourceFilePropertyCommand);
commands.push_back(new cmGetTargetPropertyCommand); commands.push_back(new cmGetTargetPropertyCommand);
commands.push_back(new cmGetTestPropertyCommand); commands.push_back(new cmGetTestPropertyCommand);
commands.push_back(new cmIncludeExternalMSProjectCommand); commands.push_back(new cmIncludeExternalMSProjectCommand);

8
Source/cmake.cxx
View File

@ -66,9 +66,11 @@
#include <stdlib.h> // required for atoi #include <stdlib.h> // required for atoi
#ifdef __APPLE__ #if defined( __APPLE__ )
# include "cmGlobalXCodeGenerator.h" # if defined(CMAKE_BUILD_WITH_CMAKE)
# define CMAKE_USE_XCODE 1 # include "cmGlobalXCodeGenerator.h"
# define CMAKE_USE_XCODE 1
# endif
# include <sys/types.h> # include <sys/types.h>
# include <sys/time.h> # include <sys/time.h>
# include <sys/resource.h> # include <sys/resource.h>