Przeglądaj źródła

cotire 1.0.2

* Fix Xcode 4.3 compatibility.
* Cotire manual corrections.
master
Sascha Kratky 14 lat temu
rodzic
commit
75a22eb479
2 zmienionych plików z 7 dodań i 15 usunięć
  1. +2
    -15
      CMake/cotire.cmake
  2. +5
    -0
      HISTORY.md

+ 2
- 15
CMake/cotire.cmake Wyświetl plik

@@ -36,7 +36,7 @@ set(__COTIRE_INCLUDED TRUE)
cmake_minimum_required(VERSION 2.8.5) cmake_minimum_required(VERSION 2.8.5)


set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") 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) include(CMakeParseArguments)


@@ -2183,20 +2183,7 @@ if (CMAKE_SCRIPT_MODE_FILE)
include("${COTIRE_ARGV2}") include("${COTIRE_ARGV2}")
endif() 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 # for MSVC, compiler IDs may not always be set correctly
if (MSVC) if (MSVC)
set (CMAKE_C_COMPILER_ID "MSVC") set (CMAKE_C_COMPILER_ID "MSVC")


+ 5
- 0
HISTORY.md Wyświetl plik

@@ -1,3 +1,8 @@
## 1.0.2 (2012-03-16)

* Fix Xcode 4.3 compatibility.
* Cotire manual corrections.

## 1.0.1 (2012-03-15) ## 1.0.1 (2012-03-15)


* Cotire manual corrections. * Cotire manual corrections.


Ładowanie…
Anuluj
Zapisz