aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclick <none@none>2010-10-20 16:35:17 +0200
committerclick <none@none>2010-10-20 16:35:17 +0200
commit88f81d80a484e4a0a598af133966d81d382a8479 (patch)
treea69675181a91c561e3a710a3ee4f7afd7342b891
parent8996a10f6cf5cd842d346c57a9135f856dbe2b77 (diff)
BuildSystem: Add XCode specific compiler handling in the OSX compile-instructions (_BUILD_DIRECTIVE gave error)
Update issue #4368 OSX/XCode compilation is not "fixed" as such untill a newew release of G3D is sorted. This is worked on from the G3D developers, and known. --HG-- branch : trunk
-rw-r--r--cmake/compiler/xcode/settings.cmake1
-rw-r--r--cmake/platform/osx/settings.cmake2
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/compiler/xcode/settings.cmake b/cmake/compiler/xcode/settings.cmake
index 8f94516c354..cd33fc1fa21 100644
--- a/cmake/compiler/xcode/settings.cmake
+++ b/cmake/compiler/xcode/settings.cmake
@@ -1,3 +1,2 @@
# Set build-directive (used in core to tell which buildtype we used)
add_definitions(-D_BUILD_DIRECTIVE="$(CONFIGURATION)")
-
diff --git a/cmake/platform/osx/settings.cmake b/cmake/platform/osx/settings.cmake
index 73d62ce2d59..f623ecf8c27 100644
--- a/cmake/platform/osx/settings.cmake
+++ b/cmake/platform/osx/settings.cmake
@@ -27,3 +27,5 @@ add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
)
message(STATUS "OSX: Created uninstall target")
+
+include(${CMAKE_SOURCE_DIR}/cmake/compiler/xcode/settings.cmake)