[Cmake-commits] CMake branch, next, updated. v2.8.8-2863-gbad011f

Brad King brad.king at kitware.com
Mon May 14 16:03:19 EDT 2012


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  bad011ffc1c5edadb73d2480ac375f765a62d9b6 (commit)
       via  16ee19731e13abcd7d36d18822f61b7679322631 (commit)
      from  a0a5a2d2d6c93d5ca6c3a2156a0cedd726a73174 (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=bad011ffc1c5edadb73d2480ac375f765a62d9b6
commit bad011ffc1c5edadb73d2480ac375f765a62d9b6
Merge: a0a5a2d 16ee197
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 14 16:03:17 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 14 16:03:17 2012 -0400

    Merge topic 'FindwxWidgets-OpenBSD' into next
    
    16ee197 FindwxWidgets: Do not use -isystem on OpenBSD (#13219)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16ee19731e13abcd7d36d18822f61b7679322631
commit 16ee19731e13abcd7d36d18822f61b7679322631
Author:     Anthony J. Bentley <anthonyjbentley at gmail.com>
AuthorDate: Mon May 14 15:42:00 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 14 16:01:35 2012 -0400

    FindwxWidgets: Do not use -isystem on OpenBSD (#13219)
    
    Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM on OpenBSD in addition to Apple to
    prevent UsewxWidgets.cmake from using the include_directories SYSTEM
    option.

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 0bc6172..865a6c5 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -167,9 +167,9 @@ SET(wxWidgets_CXX_FLAGS    "")
 #   http://www.cmake.org/pipermail/cmake/2008-April/021115.html
 #   http://www.cmake.org/pipermail/cmake/2008-April/021146.html
 #
-IF(APPLE)
+IF(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
   SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
-ENDIF(APPLE)
+ENDIF()
 
 # DEPRECATED: This is a patch to support the DEPRECATED use of
 # wxWidgets_USE_LIBS.

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

Summary of changes:
 Modules/FindwxWidgets.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list