[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-982-gf904dd1

[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  f904dd1e6af8208ab6f931f6580eb9eb094b82fc (commit)
       via  02e34de2b6c27ee5d367be4fa280ffd3ad1965ba (commit)
      from  1b4883412b9a507fc969b9ea3f8f01c54a6eafeb (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=f904dd1e6af8208ab6f931f6580eb9eb094b82fc
commit f904dd1e6af8208ab6f931f6580eb9eb094b82fc
Merge: 1b48834 02e34de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 1 16:07:45 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 1 16:07:45 2014 -0500

    Merge topic 'FindOpenGL-revert-imported-targets' into next
    
    02e34de2 FindOpenGL: Revert support for imported targets (#15267)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02e34de2b6c27ee5d367be4fa280ffd3ad1965ba
commit 02e34de2b6c27ee5d367be4fa280ffd3ad1965ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 1 16:01:09 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 1 16:01:09 2014 -0500

    FindOpenGL: Revert support for imported targets (#15267)
    
    Revert the feature added by commit v3.1.0-rc1~420^2~2 (FindOpenGL:
    Provide imported targets for GL and GLU, 2014-05-31).  Unfortunately it
    does not work on Windows because the full path to each library file is
    not actually known.  The IMPORTED_LOCATION of an imported target must be
    a full path, but OPENGL_gl_LIBRARY is just 'opengl32' on Windows because
    the actual library file is in some implicit link directory that we may
    know know.
    
    More infrastructure will be needed in CMake to allow a name-only
    imported library.  Until that exists, we will not be able to provide
    imported targets in FindOpenGL.

diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst
index 65aae00..1272d91 100644
--- a/Help/release/3.1.0.rst
+++ b/Help/release/3.1.0.rst
@@ -230,9 +230,6 @@ Modules
 
 * The :module:`FindOpenCL` module was introduced.
 
-* The :module:`FindOpenGL` module now provides imported targets
-  ``OpenGL::GL`` and ``OpenGL::GLU`` when the libraries are found.
-
 * The :module:`FindOpenMP` module learned to support Fortran.
 
 * The :module:`FindPkgConfig` module learned to use the ``PKG_CONFIG``
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 2b3bd14..a83a6c3 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -4,16 +4,6 @@
 #
 # FindModule for OpenGL and GLU.
 #
-# IMPORTED Targets
-# ^^^^^^^^^^^^^^^^
-#
-# This module defines the :prop_tgt:`IMPORTED` targets:
-#
-# ``OpenGL::GL``
-#  Defined if the system has OpenGL.
-# ``OpenGL::GLU``
-#  Defined if the system has GLU.
-#
 # Result Variables
 # ^^^^^^^^^^^^^^^^
 #
@@ -191,36 +181,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL REQUIRED_VARS ${_OpenGL_REQUIRED_VARS})
 unset(_OpenGL_REQUIRED_VARS)
 
-# OpenGL:: targets
-if(OPENGL_FOUND)
-  if(NOT TARGET OpenGL::GL)
-    add_library(OpenGL::GL UNKNOWN IMPORTED)
-    set_target_properties(OpenGL::GL PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}")
-    if(OPENGL_gl_LIBRARY MATCHES "/([^/]+)\\.framework$")
-      set_target_properties(OpenGL::GL PROPERTIES
-        IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}")
-    else()
-      set_target_properties(OpenGL::GL PROPERTIES
-        IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}")
-    endif()
-  endif()
-
-  if(OPENGL_GLU_FOUND AND NOT TARGET OpenGL::GLU)
-    add_library(OpenGL::GLU UNKNOWN IMPORTED)
-    set_target_properties(OpenGL::GLU PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}"
-      INTERFACE_LINK_LIBRARIES OpenGL::GL)
-    if(OPENGL_glu_LIBRARY MATCHES "/([^/]+)\\.framework$")
-      set_target_properties(OpenGL::GLU PROPERTIES
-        IMPORTED_LOCATION "${OPENGL_glu_LIBRARY}/${CMAKE_MATCH_1}")
-    else()
-      set_target_properties(OpenGL::GLU PROPERTIES
-        IMPORTED_LOCATION "${OPENGL_glu_LIBRARY}")
-    endif()
-  endif()
-endif()
-
 mark_as_advanced(
   OPENGL_INCLUDE_DIR
   OPENGL_xmesa_INCLUDE_DIR

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

Summary of changes:
 Help/release/3.1.0.rst   |    3 ---
 Modules/FindOpenGL.cmake |   40 ----------------------------------------
 2 files changed, 43 deletions(-)


hooks/post-receive
-- 
CMake