[Cmake-commits] CMake branch, next, updated. v3.2.2-3175-gb370440
Brad King
brad.king at kitware.com
Tue May 26 13:08:07 EDT 2015
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 b3704401400218f764b38a382f8817d2f70f2478 (commit)
via 81cc71b5385fc9e50e5b7151faa79befcbc13326 (commit)
from acd20f46b3e87af03da49b9337272e3b1297b4ba (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=b3704401400218f764b38a382f8817d2f70f2478
commit b3704401400218f764b38a382f8817d2f70f2478
Merge: acd20f4 81cc71b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 13:08:06 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 13:08:06 2015 -0400
Merge topic 'FindOpenGL-target' into next
81cc71b5 Revert topic 'FindOpenGL-target'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81cc71b5385fc9e50e5b7151faa79befcbc13326
commit 81cc71b5385fc9e50e5b7151faa79befcbc13326
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 13:07:28 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 13:07:28 2015 -0400
Revert topic 'FindOpenGL-target'
It will be restored after IMPORTED_LINK_ITEM design is finalized.
diff --git a/Help/release/dev/FindOpenGL-target.rst b/Help/release/dev/FindOpenGL-target.rst
deleted file mode 100644
index 670507e..0000000
--- a/Help/release/dev/FindOpenGL-target.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FindOpenGL-target
------------------
-
-* The :module:`FindOpenGL` module now provides imported targets
- ``OpenGL::GL`` and ``OpenGL::GLU`` when the libraries are found.
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index f4cf6d7..a7eefa7 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
# ^^^^^^^^^^^^^^^^
#
@@ -178,55 +168,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)
- if(IS_ABSOLUTE "${OPENGL_gl_LIBRARY}")
- add_library(OpenGL::GL UNKNOWN IMPORTED)
- if(OPENGL_gl_LIBRARY MATCHES "/([^/]+)\\.framework$")
- set_property(TARGET OpenGL::GL PROPERTY
- IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}"
- )
- else()
- set_property(TARGET OpenGL::GL PROPERTY
- IMPORTED_LOCATION "${OPENGL_gl_LIBRARY}"
- )
- endif()
- else()
- add_library(OpenGL::GL INTERFACE IMPORTED)
- set_property(TARGET OpenGL::GL PROPERTY
- IMPORTED_LINK_ITEM "${OPENGL_gl_LIBRARY}"
- )
- endif()
- set_property(TARGET OpenGL::GL PROPERTY
- INTERFACE_INCLUDE_DIRECTORIES "${OPENGL_INCLUDE_DIR}"
- )
- endif()
-
- if(OPENGL_GLU_FOUND AND NOT TARGET OpenGL::GLU)
- if(IS_ABSOLUTE "${OPENGL_glu_LIBRARY}")
- add_library(OpenGL::GLU UNKNOWN IMPORTED)
- if(OPENGL_glu_LIBRARY MATCHES "/([^/]+)\\.framework$")
- set_property(TARGET OpenGL::GLU PROPERTY
- IMPORTED_LOCATION "${OPENGL_glu_LIBRARY}/${CMAKE_MATCH_1}"
- )
- else()
- set_property(TARGET OpenGL::GLU PROPERTY
- IMPORTED_LOCATION "${OPENGL_glu_LIBRARY}"
- )
- endif()
- else()
- add_library(OpenGL::GLU INTERFACE IMPORTED)
- set_property(TARGET OpenGL::GLU PROPERTY
- IMPORTED_LINK_ITEM "${OPENGL_glu_LIBRARY}"
- )
- endif()
- set_property(TARGET OpenGL::GLU PROPERTY
- INTERFACE_LINK_LIBRARIES OpenGL::GL
- )
- endif()
-endif()
-
mark_as_advanced(
OPENGL_INCLUDE_DIR
OPENGL_xmesa_INCLUDE_DIR
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c7f1235..b61e3af 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1342,7 +1342,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
if(CMake_TEST_FindJsonCpp)
add_subdirectory(FindJsonCpp)
endif()
- add_subdirectory(FindOpenGL)
# Matlab module
if(CMake_TEST_FindMatlab)
diff --git a/Tests/FindOpenGL/CMakeLists.txt b/Tests/FindOpenGL/CMakeLists.txt
deleted file mode 100644
index 187fff5..0000000
--- a/Tests/FindOpenGL/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_test(NAME FindOpenGL.Test COMMAND
- ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/FindOpenGL/Test"
- "${CMake_BINARY_DIR}/Tests/FindOpenGL/Test"
- ${build_generator_args}
- --build-project TestFindOpenGL
- --build-options ${build_options}
- -DCMake_TEST_FindOpenGL_REQUIRED=${CMake_TEST_FindOpenGL_REQUIRED}
- --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
- )
diff --git a/Tests/FindOpenGL/Test/CMakeLists.txt b/Tests/FindOpenGL/Test/CMakeLists.txt
deleted file mode 100644
index 80a610f..0000000
--- a/Tests/FindOpenGL/Test/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-cmake_minimum_required(VERSION 3.2)
-project(TestFindOpenGL C)
-include(CTest)
-
-if(CMake_TEST_FindOpenGL_REQUIRED)
- find_package(OpenGL REQUIRED)
-else()
- find_package(OpenGL)
- if(NOT OPENGL_FOUND)
- message("OpenGL not found, skipping rest of test.")
- return()
- endif()
-endif()
-
-add_executable(test_opengl_tgt main.c)
-if(TARGET OpenGL::GLU)
- target_link_libraries(test_opengl_tgt OpenGL::GLU)
- target_compile_definitions(test_opengl_tgt PRIVATE HAVE_GLU)
-else()
- target_link_libraries(test_opengl_tgt OpenGL::GL)
-endif()
-add_test(NAME test_opengl_tgt COMMAND test_opengl_tgt)
-
-add_executable(test_opengl_var main.c)
-if(OPENGL_glu_LIBRARY)
- target_compile_definitions(test_opengl_var PRIVATE HAVE_GLU)
-endif()
-target_include_directories(test_opengl_var PRIVATE ${OPENGL_INCLUDE_DIR})
-target_link_libraries(test_opengl_var PRIVATE ${OPENGL_LIBRARIES})
-add_test(NAME test_opengl_var COMMAND test_opengl_var)
diff --git a/Tests/FindOpenGL/Test/main.c b/Tests/FindOpenGL/Test/main.c
deleted file mode 100644
index 0b55c74..0000000
--- a/Tests/FindOpenGL/Test/main.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifdef __APPLE__
-# pragma GCC diagnostic ignored "-Wdeprecated"
-# include <OpenGL/gl.h>
-# ifdef HAVE_GLU
-# include <OpenGL/glu.h>
-# endif
-#else
-# ifdef _WIN32
-# include <windows.h>
-# endif
-# include <GL/gl.h>
-# ifdef HAVE_GLU
-# include <GL/glu.h>
-# endif
-#endif
-
-#ifdef __GNUC__
-# pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
-#endif
-
-int main(int argc, char* argv[])
-{
- (void)argv;
-#ifdef HAVE_GLU
- /* Link to a GLU symbol that can be called without a context. */
- gluErrorString(GLU_INVALID_ENUM);
-#endif
- /* Link to a GL symbol without calling it since we have no context. */
- return ((int)(&glGetError)) % argc;
-}
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindOpenGL-target.rst | 5 ---
Modules/FindOpenGL.cmake | 59 --------------------------------
Tests/CMakeLists.txt | 1 -
Tests/FindOpenGL/CMakeLists.txt | 11 ------
Tests/FindOpenGL/Test/CMakeLists.txt | 30 ----------------
Tests/FindOpenGL/Test/main.c | 30 ----------------
6 files changed, 136 deletions(-)
delete mode 100644 Help/release/dev/FindOpenGL-target.rst
delete mode 100644 Tests/FindOpenGL/CMakeLists.txt
delete mode 100644 Tests/FindOpenGL/Test/CMakeLists.txt
delete mode 100644 Tests/FindOpenGL/Test/main.c
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list