From 75a22eb479b66a693ed68a111290f311d81d29e0 Mon Sep 17 00:00:00 2001 From: Sascha Kratky Date: Fri, 16 Mar 2012 20:55:55 +0100 Subject: [PATCH] cotire 1.0.2 * Fix Xcode 4.3 compatibility. * Cotire manual corrections. --- CMake/cotire.cmake | 17 ++--------------- HISTORY.md | 5 +++++ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/CMake/cotire.cmake b/CMake/cotire.cmake index e1696df..349b59f 100644 --- a/CMake/cotire.cmake +++ b/CMake/cotire.cmake @@ -36,7 +36,7 @@ set(__COTIRE_INCLUDED TRUE) cmake_minimum_required(VERSION 2.8.5) set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") -set (COTIRE_CMAKE_MODULE_VERSION "1.0.1") +set (COTIRE_CMAKE_MODULE_VERSION "1.0.2") include(CMakeParseArguments) @@ -2183,20 +2183,7 @@ if (CMAKE_SCRIPT_MODE_FILE) include("${COTIRE_ARGV2}") endif() - if (APPLE AND "$ENV{DEVELOPER_BIN_DIR}" MATCHES ".+") - # for Xcode, override compiler executables used - if ("$ENV{GCC_VERSION}" MATCHES "clang") - set (CMAKE_C_COMPILER_ID "Clang") - set (CMAKE_CXX_COMPILER_ID "Clang") - set (CMAKE_C_COMPILER "$ENV{DEVELOPER_BIN_DIR}/clang") - set (CMAKE_CXX_COMPILER "$ENV{DEVELOPER_BIN_DIR}/clang++") - else() - set (CMAKE_C_COMPILER_ID "GNU") - set (CMAKE_CXX_COMPILER_ID "GNU") - set (CMAKE_C_COMPILER "$ENV{DEVELOPER_BIN_DIR}/cc") - set (CMAKE_CXX_COMPILER "$ENV{DEVELOPER_BIN_DIR}/g++") - endif() - elseif (WIN32) + if (WIN32) # for MSVC, compiler IDs may not always be set correctly if (MSVC) set (CMAKE_C_COMPILER_ID "MSVC") diff --git a/HISTORY.md b/HISTORY.md index 3c1459a..541fea5 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,8 @@ +## 1.0.2 (2012-03-16) + +* Fix Xcode 4.3 compatibility. +* Cotire manual corrections. + ## 1.0.1 (2012-03-15) * Cotire manual corrections.