diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-22 18:04:49 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-22 18:04:49 (GMT) |
| commit | 43b9f184c2f9cacce2917577f9469f71f64885c5 (patch) | |
| tree | cc06f70ce213992f992f739496b6ed3b401977be | |
| parent | 36e272843154c6ea475fd3c19a39a0d27dbcafa5 (diff) | |
| download | CMake-43b9f184c2f9cacce2917577f9469f71f64885c5.zip CMake-43b9f184c2f9cacce2917577f9469f71f64885c5.tar.gz CMake-43b9f184c2f9cacce2917577f9469f71f64885c5.tar.bz2 | |
COMP: Fix apple bootstrap issues
| -rw-r--r-- | Source/cmBootstrapCommands.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCommands.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx index c8769f0..7eafd34 100644 --- a/Source/cmBootstrapCommands.cxx +++ b/Source/cmBootstrapCommands.cxx @@ -43,6 +43,7 @@ #include "cmForEachCommand.cxx" #include "cmGetCMakePropertyCommand.cxx" #include "cmGetFilenameComponentCommand.cxx" +#include "cmGetSourceFilePropertyCommand.cxx" #include "cmIfCommand.cxx" #include "cmIncludeCommand.cxx" #include "cmIncludeDirectoryCommand.cxx" @@ -90,6 +91,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands) commands.push_back(new cmForEachCommand); commands.push_back(new cmGetCMakePropertyCommand); commands.push_back(new cmGetFilenameComponentCommand); + commands.push_back(new cmGetSourceFilePropertyCommand); commands.push_back(new cmIfCommand); commands.push_back(new cmIncludeCommand); commands.push_back(new cmIncludeDirectoryCommand); diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index 2ad50b1..f3bf189 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -27,7 +27,6 @@ #include "cmExportLibraryDependencies.cxx" #include "cmFLTKWrapUICommand.cxx" #include "cmGetDirectoryPropertyCommand.cxx" -#include "cmGetSourceFilePropertyCommand.cxx" #include "cmGetTargetPropertyCommand.cxx" #include "cmGetTestPropertyCommand.cxx" #include "cmIncludeExternalMSProjectCommand.cxx" @@ -82,7 +81,6 @@ void GetPredefinedCommands(std::list<cmCommand*>& commands.push_back(new cmExportLibraryDependenciesCommand); commands.push_back(new cmFLTKWrapUICommand); commands.push_back(new cmGetDirectoryPropertyCommand); - commands.push_back(new cmGetSourceFilePropertyCommand); commands.push_back(new cmGetTargetPropertyCommand); commands.push_back(new cmGetTestPropertyCommand); commands.push_back(new cmIncludeExternalMSProjectCommand); diff --git a/Source/cmake.cxx b/Source/cmake.cxx index a66e83b..7ed09a9 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -66,9 +66,11 @@ #include <stdlib.h> // required for atoi -#ifdef __APPLE__ -# include "cmGlobalXCodeGenerator.h" -# define CMAKE_USE_XCODE 1 +#if defined( __APPLE__ ) +# if defined(CMAKE_BUILD_WITH_CMAKE) +# include "cmGlobalXCodeGenerator.h" +# define CMAKE_USE_XCODE 1 +# endif # include <sys/types.h> # include <sys/time.h> # include <sys/resource.h> |