[Cmake-commits] CMake branch, next, updated. v3.0.1-5197-g916ff4b

Brad King brad.king at kitware.com
Mon Sep 8 11:40:10 EDT 2014


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  916ff4bf097452b4621addd1df775c950dcf129d (commit)
       via  0d618d212e73e4ab1e72447e890b33da15d17c66 (commit)
       via  c3739695c521a3f9c10ae6a31e4f33bd9783aff7 (commit)
      from  62f8c7accd092c81ad1a26001603499b9d9146d2 (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=916ff4bf097452b4621addd1df775c950dcf129d
commit 916ff4bf097452b4621addd1df775c950dcf129d
Merge: 62f8c7a 0d618d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 8 11:40:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 8 11:40:09 2014 -0400

    Merge topic 'update-kwsys' into next
    
    0d618d21 Merge branch 'upstream-kwsys' into update-kwsys
    c3739695 KWSys 2014-09-08 (80e852f6)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d618d212e73e4ab1e72447e890b33da15d17c66
commit 0d618d212e73e4ab1e72447e890b33da15d17c66
Merge: c2ad11e c373969
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 8 11:41:29 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 8 11:41:29 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3739695c521a3f9c10ae6a31e4f33bd9783aff7
commit c3739695c521a3f9c10ae6a31e4f33bd9783aff7
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Mon Sep 8 09:54:24 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 8 11:41:25 2014 -0400

    KWSys 2014-09-08 (80e852f6)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 80e852f6 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 93eb1a1f..80e852f6
    Brad King (1):
          80e852f6 kwsysPlatformTests: Use if(DEFINED) to simplify conditions
    
    Change-Id: I3952574be954b33386186fd3acbaeb74a6d6e217

diff --git a/kwsysPlatformTests.cmake b/kwsysPlatformTests.cmake
index f9ee254..16bc969 100644
--- a/kwsysPlatformTests.cmake
+++ b/kwsysPlatformTests.cmake
@@ -13,7 +13,7 @@ SET(KWSYS_PLATFORM_TEST_FILE_C kwsysPlatformTestsC.c)
 SET(KWSYS_PLATFORM_TEST_FILE_CXX kwsysPlatformTestsCXX.cxx)
 
 MACRO(KWSYS_PLATFORM_TEST lang var description invert)
-  IF("${var}_COMPILED" MATCHES "^${var}_COMPILED$")
+  IF(NOT DEFINED ${var}_COMPILED)
     MESSAGE(STATUS "${description}")
     TRY_COMPILE(${var}_COMPILED
       ${CMAKE_CURRENT_BINARY_DIR}
@@ -43,7 +43,7 @@ MACRO(KWSYS_PLATFORM_TEST lang var description invert)
         MESSAGE(STATUS "${description} - no")
       ENDIF(${var}_COMPILED)
     ENDIF(${invert} MATCHES INVERT)
-  ENDIF("${var}_COMPILED" MATCHES "^${var}_COMPILED$")
+  ENDIF()
   IF(${invert} MATCHES INVERT)
     IF(${var}_COMPILED)
       SET(${var} 0)
@@ -60,7 +60,7 @@ MACRO(KWSYS_PLATFORM_TEST lang var description invert)
 ENDMACRO(KWSYS_PLATFORM_TEST)
 
 MACRO(KWSYS_PLATFORM_TEST_RUN lang var description invert)
-  IF("${var}" MATCHES "^${var}$")
+  IF(NOT DEFINED ${var})
     MESSAGE(STATUS "${description}")
     TRY_RUN(${var} ${var}_COMPILED
       ${CMAKE_CURRENT_BINARY_DIR}
@@ -107,7 +107,7 @@ MACRO(KWSYS_PLATFORM_TEST_RUN lang var description invert)
         MESSAGE(STATUS "${description} - failed to compile")
       ENDIF(${var}_COMPILED)
     ENDIF(${invert} MATCHES INVERT)
-  ENDIF("${var}" MATCHES "^${var}$")
+  ENDIF()
 
   IF(${invert} MATCHES INVERT)
     IF(${var}_COMPILED)

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

Summary of changes:
 Source/kwsys/kwsysPlatformTests.cmake |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list