[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-813-g8ab1833

[Gregor Jasny]

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  8ab1833c2ad99fa882b7aa85ac87ded78c580576 (commit)
       via  cee12fd8a8c10258e0dde6cb7c44b64eaf65712c (commit)
      from  998a7db7d498dc96407ad960f24d5294859d889b (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=8ab1833c2ad99fa882b7aa85ac87ded78c580576
commit 8ab1833c2ad99fa882b7aa85ac87ded78c580576
Merge: 998a7db cee12fd
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Oct 21 13:31:43 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 13:31:43 2015 -0400

    Merge topic 'xcode-optimization-flags' into next
    
    cee12fd8 Xcode: Test that extraction of -O flags preserves others


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
commit cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Wed Oct 21 19:25:13 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Wed Oct 21 19:25:13 2015 +0200

    Xcode: Test that extraction of -O flags preserves others

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index a8c6816..7901ec0 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -5,6 +5,7 @@ run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
 run_cmake(XcodeOptimizationFlags)
+run_cmake(XcodePreserveNonOptimizationFlags)
 run_cmake(XcodePreserveObjcFlag)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
new file mode 100644
index 0000000..2f6c03d
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
@@ -0,0 +1,8 @@
+file(STRINGS ${RunCMake_TEST_BINARY_DIR}/XcodePreserveNonOptimizationFlags.xcodeproj/project.pbxproj actual
+     REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;")
+foreach(expect "-DA" "-DB +-DC" "-DD")
+  if(NOT "${actual}" MATCHES "${expect}")
+    message(SEND_ERROR "The actual project contains the lines:\n ${actual}\n"
+      "which do not match expected regex:\n ${expect}\n")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
new file mode 100644
index 0000000..16f0381
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
@@ -0,0 +1,12 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported configuration types")
+
+project(XcodePreserveNonOptimizationFlags CXX)
+
+add_library(preserveStart STATIC foo.cpp)
+set_property(TARGET preserveStart PROPERTY COMPILE_OPTIONS -DA -O1)
+
+add_library(preserveBoth STATIC foo.cpp)
+set_property(TARGET preserveBoth PROPERTY COMPILE_OPTIONS -DB -O1 -DC)
+
+add_library(preserveEnd STATIC foo.cpp)
+set_property(TARGET preserveEnd PROPERTY COMPILE_OPTIONS -O1 -DD)

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

Summary of changes:
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake             |    1 +
 .../XcodePreserveNonOptimizationFlags-check.cmake          |    8 ++++++++
 .../XcodeProject/XcodePreserveNonOptimizationFlags.cmake   |   12 ++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake


hooks/post-receive
-- 
CMake