[Cmake-commits] CMake branch, next, updated. v2.8.1-1267-ga5fc53a

[cmake-commits at cmake.org]

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  a5fc53aeb70e835a40761b2a5ce2034132ea8ae1 (commit)
       via  6a009280fd38380f5d00dc073d63e51737ceb293 (commit)
      from  ab5d132bf99124a5920c4aed6986655235123e3b (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=a5fc53aeb70e835a40761b2a5ce2034132ea8ae1
commit a5fc53aeb70e835a40761b2a5ce2034132ea8ae1
Merge: ab5d132 6a00928
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 1 17:49:18 2010 -0400

    Merge branch 'per-config-link-flags' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a009280fd38380f5d00dc073d63e51737ceb293
commit 6a009280fd38380f5d00dc073d63e51737ceb293
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 1 17:46:58 2010 -0400

    Better "bad" flag in LinkFlags test
    
    The Intel C Compiler for Linux ignores _BADFLAG_ when linking!  Use a
    flag that looks like a missing object file to ensure its rejection.

diff --git a/Tests/LinkFlags/CMakeLists.txt b/Tests/LinkFlags/CMakeLists.txt
index 48161f1..b510442 100644
--- a/Tests/LinkFlags/CMakeLists.txt
+++ b/Tests/LinkFlags/CMakeLists.txt
@@ -2,23 +2,24 @@ cmake_minimum_required(VERSION 2.8)
 project(LinkFlags C)
 
 string(TOUPPER "${TEST_CONFIG}" TEST_CONFIG_UPPER)
+set(obj "${CMAKE_C_OUTPUT_EXTENSION}")
 
 add_library(LinkFlags_lib STATIC LinkFlagsLib.c)
-set_property(TARGET LinkFlags_lib PROPERTY STATIC_LIBRARY_FLAGS _BADFLAG_)
+set_property(TARGET LinkFlags_lib PROPERTY STATIC_LIBRARY_FLAGS BADFLAG${obj})
 
 add_library(LinkFlags_dll SHARED LinkFlagsLib.c)
-set_property(TARGET LinkFlags_dll PROPERTY LINK_FLAGS _BADFLAG_)
+set_property(TARGET LinkFlags_dll PROPERTY LINK_FLAGS BADFLAG${obj})
 
 add_executable(LinkFlags_exe LinkFlags.c)
-set_property(TARGET LinkFlags_exe PROPERTY LINK_FLAGS _BADFLAG_)
+set_property(TARGET LinkFlags_exe PROPERTY LINK_FLAGS BADFLAG${obj})
 
 add_library(LinkFlags_lib_config STATIC LinkFlagsLib.c)
-set_property(TARGET LinkFlags_lib_config PROPERTY STATIC_LIBRARY_FLAGS_${TEST_CONFIG_UPPER} _BADFLAG_${TEST_CONFIG}_)
+set_property(TARGET LinkFlags_lib_config PROPERTY STATIC_LIBRARY_FLAGS_${TEST_CONFIG_UPPER} BADFLAG_${TEST_CONFIG}${obj})
 
 add_library(LinkFlags_dll_config SHARED LinkFlagsLib.c)
-set_property(TARGET LinkFlags_dll_config PROPERTY LINK_FLAGS_${TEST_CONFIG_UPPER} _BADFLAG_${TEST_CONFIG}_)
+set_property(TARGET LinkFlags_dll_config PROPERTY LINK_FLAGS_${TEST_CONFIG_UPPER} BADFLAG_${TEST_CONFIG}${obj})
 
 add_executable(LinkFlags_exe_config LinkFlags.c)
-set_property(TARGET LinkFlags_exe_config PROPERTY LINK_FLAGS_${TEST_CONFIG_UPPER} _BADFLAG_${TEST_CONFIG}_)
+set_property(TARGET LinkFlags_exe_config PROPERTY LINK_FLAGS_${TEST_CONFIG_UPPER} BADFLAG_${TEST_CONFIG}${obj})
 
 add_executable(LinkFlags LinkFlags.c)

-----------------------------------------------------------------------

Summary of changes:
 Tests/LinkFlags/CMakeLists.txt |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake