From 4889158b84cfd0647bdd7dc733a38ebc01be2b4d Mon Sep 17 00:00:00 2001
From: flithm <unknown>
Date: Wed, 29 Aug 2007 11:35:50 +0000
Subject: [PATCH] Fixes for detecting standard library

---
 cmaked/CMakeDInformation.cmake  | 2 +-
 cmaked/CMakeTestDCompiler.cmake | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmaked/CMakeDInformation.cmake b/cmaked/CMakeDInformation.cmake
index 954b3e5..2e2620a 100644
--- a/cmaked/CMakeDInformation.cmake
+++ b/cmaked/CMakeDInformation.cmake
@@ -142,7 +142,7 @@ ELSE(CMAKE_COMPILER_IS_GDC)
     SET(CMAKE_LIBRARY_PATH_FLAG "-L")
   ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 ENDIF(CMAKE_COMPILER_IS_GDC)
-
+
 IF(CMAKE_D_USE_TANGO)
 	IF(CMAKE_COMPILER_IS_GDC)
 		SET(DSTDLIB_TYPE "-fversion=Tango")
diff --git a/cmaked/CMakeTestDCompiler.cmake b/cmaked/CMakeTestDCompiler.cmake
index 5f3115a..4fb7c7c 100644
--- a/cmaked/CMakeTestDCompiler.cmake
+++ b/cmaked/CMakeTestDCompiler.cmake
@@ -158,6 +158,12 @@ ELSE(NOT CMAKE_D_TANGO_WORKS)
   ENDIF(C_TEST_WAS_RUN)
   SET(CMAKE_D_TANGO_WORKS 1 CACHE INTERNAL "")
 ENDIF(NOT CMAKE_D_TANGO_WORKS)
+
+# if both tango and phobos are selected try to choose which one is available
+IF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
+	MESSAGE(FATAL_ERROR "Tango AND Phobos selected, please choose one or the other!")
+ENDIF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
+
 # ensure the user has the appropriate std lib available
 IF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
 	MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!")