[Cmake-commits] CMake branch, next, updated. v3.7.2-2365-g4b9e085

Brad King brad.king at kitware.com
Thu Jan 26 13:05:13 EST 2017 

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  4b9e085f77ac2500d2a3bbd2253acbc6b1c84c0e (commit)
       via  c3a22518f83dfe8e1787e93f05398a5263cc781a (commit)
       via  d491172445dcd32547fbeb3598510455e8e44132 (commit)
       via  1a2a9b0d08c7ba2af168856b1220d42ff9a80921 (commit)
      from  7c51e930146249c1220275a030af5b557b0a4799 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b9e085f77ac2500d2a3bbd2253acbc6b1c84c0e
commit 4b9e085f77ac2500d2a3bbd2253acbc6b1c84c0e
Merge: 7c51e93 c3a2251
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 13:05:12 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 13:05:12 2017 -0500

    Merge topic 'test-GeneratorExpression-update' into next
    
    c3a22518 Tests: Extend GeneratorExpression to work with more configurations
    d4911724 Tests: Teach GeneratorExpression to cover spaces in include dirs
    1a2a9b0d Tests: Simplify GeneratorExpression imported include directory check


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3a22518f83dfe8e1787e93f05398a5263cc781a
commit c3a22518f83dfe8e1787e93f05398a5263cc781a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:13:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:16:08 2017 -0500

    Tests: Extend GeneratorExpression to work with more configurations
    
    Add missing pieces for RelWithDebInfo and MinSizeRel.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index dd86b6f..3091780 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -161,6 +161,10 @@ set_property(TARGET imported3 APPEND PROPERTY
   INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:DEBUG>:$<TARGET_PROPERTY:imported1,INTERFACE_INCLUDE_DIRECTORIES>>)
 set_property(TARGET imported3 APPEND PROPERTY
   INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:RELEASE>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
+set_property(TARGET imported3 APPEND PROPERTY
+  INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:RELWITHDEBINFO>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
+set_property(TARGET imported3 APPEND PROPERTY
+  INTERFACE_INCLUDE_DIRECTORIES $<$<CONFIG:MINSIZEREL>:$<TARGET_PROPERTY:imported2,INTERFACE_INCLUDE_DIRECTORIES>>)
 
 add_library(imported4 SHARED IMPORTED)
 set_property(TARGET imported4 APPEND PROPERTY
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 57abbcc..9014406 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -13,7 +13,7 @@ if(config AND NOT config STREQUAL NoConfig)
     message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
   endif()
 else()
-  if(NOT "${test_imported_includes}" MATCHES "^;$")
+  if(NOT "${test_imported_includes}" MATCHES "^;;;$")
     message(SEND_ERROR "test_imported_includes is not an empty list: ${test_imported_includes}")
   endif()
 endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d491172445dcd32547fbeb3598510455e8e44132
commit d491172445dcd32547fbeb3598510455e8e44132
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:11:25 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:11:25 2017 -0500

    Tests: Teach GeneratorExpression to cover spaces in include dirs
    
    Add a space to the imported include directories used for the test.
    This works around funny quoted-`;` interpretation by Visual Studio.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index 8ecfdd9..dd86b6f 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -145,13 +145,13 @@ add_library(imported1 SHARED IMPORTED)
 set_property(TARGET imported1 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
 set_property(TARGET imported1 PROPERTY IMPORTED_LOCATION_DEBUG debug_loc)
 set_property(TARGET imported1 PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-set_property(TARGET imported1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES /imported1/include)
+set_property(TARGET imported1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "/imported1/include/with space")
 
 add_library(imported2 SHARED IMPORTED)
 set_property(TARGET imported2 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
 set_property(TARGET imported2 PROPERTY IMPORTED_LOCATION_DEBUG debug_loc)
 set_property(TARGET imported2 PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-set_property(TARGET imported2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES /imported2/include)
+set_property(TARGET imported2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "/imported2/include/with space")
 
 add_library(imported3 SHARED IMPORTED)
 set_property(TARGET imported3 PROPERTY IMPORTED_LOCATION_RELEASE release_loc)
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index 927ead4..57abbcc 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -9,7 +9,7 @@ check(test_version_equal_1 "0")
 check(test_version_equal_2 "1")
 
 if(config AND NOT config STREQUAL NoConfig)
-  if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include;*$")
+  if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include/with space;*$")
     message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
   endif()
 else()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a2a9b0d08c7ba2af168856b1220d42ff9a80921
commit 1a2a9b0d08c7ba2af168856b1220d42ff9a80921
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:09:55 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:09:55 2017 -0500

    Tests: Simplify GeneratorExpression imported include directory check
    
    Do not duplicate the list of include directories 4 times.

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index f0d6abf..8ecfdd9 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -187,10 +187,7 @@ add_custom_target(check-part3 ALL
     -Dtest_version_equal_1=$<VERSION_EQUAL:1.0.1,1.1>
     -Dtest_version_equal_2=$<VERSION_EQUAL:1.1,1.1>
     -Dconfig=$<CONFIGURATION>
-    -Dtest_imported_debug=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-    -Dtest_imported_release=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-    -Dtest_imported_relwithdebinfo=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-    -Dtest_imported_minsizerel=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
+    -Dtest_imported_includes=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
     -Dtest_imported_fallback=$<STREQUAL:$<TARGET_FILE_NAME:importedFallback>,fallback_loc>
     -Dtest_alias_file_exe=$<STREQUAL:$<TARGET_FILE:Alias::SomeExe>,$<TARGET_FILE:someexe>>
     -Dtest_alias_file_lib=$<STREQUAL:$<TARGET_FILE:Alias::SomeLib>,$<TARGET_FILE:empty1>>
diff --git a/Tests/GeneratorExpression/check-part3.cmake b/Tests/GeneratorExpression/check-part3.cmake
index e12d8c6..927ead4 100644
--- a/Tests/GeneratorExpression/check-part3.cmake
+++ b/Tests/GeneratorExpression/check-part3.cmake
@@ -8,18 +8,15 @@ check(test_version_less_2 "1")
 check(test_version_equal_1 "0")
 check(test_version_equal_2 "1")
 
-foreach(c debug release relwithdebinfo minsizerel)
-  if(config AND NOT config STREQUAL NoConfig)
-    if(NOT "${test_imported_${c}}" MATCHES "^;/imported2/include$"
-        AND NOT "${test_imported_${c}}" MATCHES "^/imported1/include;$")
-      message(SEND_ERROR "test_imported_${c} is not correct: ${test_imported_${c}}")
-    endif()
-  else()
-    if(NOT "${test_imported_${c}}" MATCHES "^;$")
-      message(SEND_ERROR "test_imported_${c} is not an empty list: ${test_imported_${c}}")
-    endif()
+if(config AND NOT config STREQUAL NoConfig)
+  if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include;*$")
+    message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
   endif()
-endforeach()
+else()
+  if(NOT "${test_imported_includes}" MATCHES "^;$")
+    message(SEND_ERROR "test_imported_includes is not an empty list: ${test_imported_includes}")
+  endif()
+endif()
 
 check(test_imported_fallback "1")
 

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

Summary of changes:
 Tests/GeneratorExpression/CMakeLists.txt    |   13 +++++++------
 Tests/GeneratorExpression/check-part3.cmake |   19 ++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list