[Cmake-commits] CMake branch, next, updated. v3.7.2-2415-g784fe97

[Brad King]

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  784fe97dbf81cb1dcf81f213de1843a5351a94c7 (commit)
       via  498ac510f97da1932b7cf01ada26dd6401db00f0 (commit)
      from  a38022e786f751fea0785f45df9a611cbf863b34 (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=784fe97dbf81cb1dcf81f213de1843a5351a94c7
commit 784fe97dbf81cb1dcf81f213de1843a5351a94c7
Merge: a38022e 498ac51
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 13:47:52 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 13:47:52 2017 -0500

    Merge topic '16432-static-frameworks' into next
    
    498ac510 fixup! Apple: Add support for static frameworks


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=498ac510f97da1932b7cf01ada26dd6401db00f0
commit 498ac510f97da1932b7cf01ada26dd6401db00f0
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Jan 30 19:32:22 2017 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Mon Jan 30 19:32:22 2017 +0100

    fixup! Apple: Add support for static frameworks

diff --git a/Tests/Framework/CMakeLists.txt b/Tests/Framework/CMakeLists.txt
index 271aaf1..a313c2c 100644
--- a/Tests/Framework/CMakeLists.txt
+++ b/Tests/Framework/CMakeLists.txt
@@ -57,29 +57,30 @@ add_custom_target(fooCustom ALL COMMAND ${CMAKE_COMMAND} -E copy foo-post-build
 add_dependencies(fooCustom foo)
 
 # Make a static library and apply the framework properties to it to verify
-# that everything still builds correctly, but it will not actually produce
-# a framework... The framework properties only apply when the library type
-# is SHARED.
+# that everything still builds correctly. Xcode prior to version 5 does not
+# support static Frameworks.
 #
-add_library(fooStatic STATIC
-  foo.cxx
-  foo.h
-  foo2.h
-  fooExtensionlessResource
-  fooPublic.h
-  fooPublicExtensionlessHeader
-  fooPrivate.h
-  fooPrivateExtensionlessHeader
-  fooNeither.h
-  fooBoth.h
-  test.lua
-  fooDeepPublic.h
-)
-set_target_properties(fooStatic PROPERTIES
-  FRAMEWORK TRUE
-  FRAMEWORK_VERSION none
-)
-add_executable(barStatic bar.cxx)
-target_link_libraries(barStatic fooStatic)
+if(NOT XCODE OR NOT XCODE_VERSION VERSION_LESS 5)
+  add_library(fooStatic STATIC
+    foo.cxx
+    foo.h
+    foo2.h
+    fooExtensionlessResource
+    fooPublic.h
+    fooPublicExtensionlessHeader
+    fooPrivate.h
+    fooPrivateExtensionlessHeader
+    fooNeither.h
+    fooBoth.h
+    test.lua
+    fooDeepPublic.h
+  )
+  set_target_properties(fooStatic PROPERTIES
+    FRAMEWORK TRUE
+    FRAMEWORK_VERSION none
+  )
+  add_executable(barStatic bar.cxx)
+  target_link_libraries(barStatic fooStatic)
+endif()
 
 include(CPack)

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

Summary of changes:
 Tests/Framework/CMakeLists.txt |   47 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
CMake