This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via dd5fc9b136179a2873fbee14efce399c29689e29 (commit)
via f0e1017335ee910f689e75d5d6cf8327dd509bd5 (commit)
from 718ea14557ec6a12256bb4f0e9061e52e3380810 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd5fc9b136179a2873fbee14efce399c29689e29
commit dd5fc9b136179a2873fbee14efce399c29689e29
Merge: 718ea14 f0e1017
Author: Stephen Kelly <[email protected]>
AuthorDate: Wed Apr 30 06:47:08 2014 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Apr 30 06:47:08 2014 -0400
Merge topic 'WriteCompilerDetectionHeader-module' into next
f0e10173 Tests: Rely on compiler id from new CMake, not the old one.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0e1017335ee910f689e75d5d6cf8327dd509bd5
commit f0e1017335ee910f689e75d5d6cf8327dd509bd5
Author: Stephen Kelly <[email protected]>
AuthorDate: Wed Apr 30 12:45:39 2014 +0200
Commit: Stephen Kelly <[email protected]>
CommitDate: Wed Apr 30 12:45:39 2014 +0200
Tests: Rely on compiler id from new CMake, not the old one.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f5271b5..fbad2d9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -411,9 +411,8 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
ADD_TEST_MACRO(Module.FindDependency FindDependency)
- if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
- ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader
WriteCompilerDetectionHeader)
- endif()
+ ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader
WriteCompilerDetectionHeader)
+
if (APPLE OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-fPIE run_pic_test)
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index eda5098..4cc3155 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -1,6 +1,14 @@
cmake_minimum_required(VERSION 3.0.0)
project(WriteCompilerDetectionHeader)
+if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
+ "int main(int,char**) { return 0; }\n"
+ )
+ add_executable(WriteCompilerDetectionHeader
"${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
+ return()
+endif()
+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
include(WriteCompilerDetectionHeader)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 5 ++---
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 8 ++++++++
2 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
