Remove the Gui extra cmake file which was restored during the merge
When building qtsvg, the file gets picked up while doing find_package(Qt5Gui) and fails the configuration phase. Remove it as it was done before. Change-Id: I3499e33ecc129e31f8d3b144ee6370b2a9bb4f9a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alexandru Croitor
parent
bbb75d9614
commit
d35b94829c
@ -1,193 +0,0 @@
|
|||||||
|
|
||||||
!!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
|
|
||||||
|
|
||||||
!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
|
|
||||||
set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
|
|
||||||
!!ELSE
|
|
||||||
set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
_qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
list(APPEND Qt5Gui_INCLUDE_DIRS ${Qt5Gui_EGL_INCLUDE_DIRS})
|
|
||||||
set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_EGL_INCLUDE_DIRS})
|
|
||||||
set(Qt5Gui_OPENGL_INCLUDE_DIRS ${Qt5Gui_EGL_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATION IMPLIB_LOCATION)
|
|
||||||
set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
|
||||||
|
|
||||||
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
|
||||||
set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
|
||||||
!!ELSE
|
|
||||||
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
|
||||||
set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
|
||||||
!!ELSE
|
|
||||||
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
set_target_properties(Qt5::${TargetName} PROPERTIES
|
|
||||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
|
||||||
\"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
|
|
||||||
)
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
add_library(Qt5::Gui_EGL SHARED IMPORTED)
|
|
||||||
_populate_qt5gui_gl_target_properties(Gui_EGL RELEASE $${CMAKE_ANGLE_EGL_DLL_RELEASE} $${CMAKE_ANGLE_EGL_IMPLIB_RELEASE})
|
|
||||||
add_library(Qt5::Gui_GLESv2 SHARED IMPORTED)
|
|
||||||
_populate_qt5gui_gl_target_properties(Gui_GLESv2 RELEASE $${CMAKE_ANGLE_GLES2_DLL_RELEASE} $${CMAKE_ANGLE_GLES2_IMPLIB_RELEASE})
|
|
||||||
|
|
||||||
set_property(TARGET Qt5::Gui_EGL APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_EGL_INCLUDE_DIRS})
|
|
||||||
set_property(TARGET Qt5::Gui_GLESv2 APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_OPENGL_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
|
||||||
_populate_qt5gui_gl_target_properties(Gui_EGL DEBUG $${CMAKE_ANGLE_EGL_DLL_DEBUG} $${CMAKE_ANGLE_EGL_IMPLIB_DEBUG})
|
|
||||||
_populate_qt5gui_gl_target_properties(Gui_GLESv2 DEBUG $${CMAKE_ANGLE_GLES2_DLL_DEBUG} $${CMAKE_ANGLE_GLES2_IMPLIB_DEBUG})
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
set(Qt5Gui_EGL_LIBRARIES Qt5::Gui_EGL)
|
|
||||||
set(Qt5Gui_OPENGL_LIBRARIES Qt5::Gui_GLESv2)
|
|
||||||
|
|
||||||
!!ELSE
|
|
||||||
|
|
||||||
!!IF !isEmpty(CMAKE_GL_INCDIRS)
|
|
||||||
|
|
||||||
set(_GL_INCDIRS $$CMAKE_GL_INCDIRS)
|
|
||||||
find_path(_qt5gui_OPENGL_INCLUDE_DIR $$CMAKE_GL_HEADER_NAME
|
|
||||||
PATHS ${_GL_INCDIRS}
|
|
||||||
)
|
|
||||||
if (NOT _qt5gui_OPENGL_INCLUDE_DIR)
|
|
||||||
message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\")
|
|
||||||
endif()
|
|
||||||
unset(_GL_INCDIRS)
|
|
||||||
|
|
||||||
# Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is
|
|
||||||
# optional.
|
|
||||||
|
|
||||||
list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR})
|
|
||||||
set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR})
|
|
||||||
|
|
||||||
unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
|
|
||||||
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
|
|
||||||
set(Qt5Gui_${Name}_LIBRARIES)
|
|
||||||
!!IF !mac
|
|
||||||
set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs})
|
|
||||||
!!ELSE
|
|
||||||
foreach(_dir ${IncDirs})
|
|
||||||
if (EXISTS ${_dir})
|
|
||||||
list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir})
|
|
||||||
else()
|
|
||||||
find_path(_actual_dir ${_dir}) # Look in sdk directories
|
|
||||||
if (_actual_dir)
|
|
||||||
list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir})
|
|
||||||
endif()
|
|
||||||
unset(_actual_dir CACHE)
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
!!ENDIF
|
|
||||||
foreach(_lib ${Libs})
|
|
||||||
if (IS_ABSOLUTE ${_lib})
|
|
||||||
get_filename_component(_libFile ${_lib} NAME_WE)
|
|
||||||
if (_libFile MATCHES \"^${CMAKE_SHARED_LIBRARY_PREFIX}(.*)\")
|
|
||||||
set(_libFile ${CMAKE_MATCH_1})
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
set(_libFile ${_lib})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_libFile})
|
|
||||||
if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE)
|
|
||||||
if (IS_ABSOLUTE ${_lib})
|
|
||||||
set(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib})
|
|
||||||
else()
|
|
||||||
find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib}
|
|
||||||
!!IF !isEmpty(CROSS_COMPILE)
|
|
||||||
PATHS \"${LibDir}\"
|
|
||||||
!!IF !mac
|
|
||||||
NO_DEFAULT_PATH
|
|
||||||
!!ENDIF
|
|
||||||
!!ENDIF
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
!!IF mac
|
|
||||||
set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}")
|
|
||||||
if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
|
|
||||||
set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
|
|
||||||
endif()
|
|
||||||
!!ENDIF
|
|
||||||
if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
|
|
||||||
# The above find_library call doesn\'t work for finding
|
|
||||||
# libraries in Windows SDK paths outside of the proper
|
|
||||||
# environment, even if the libraries are present. In other
|
|
||||||
# cases it is OK for the libraries to not be found
|
|
||||||
# because they are optional dependencies of Qt5Gui, needed
|
|
||||||
# only if the qopengl.h header is used.
|
|
||||||
# We try to find the libraries in the first place because Qt may be
|
|
||||||
# compiled with another set of GL libraries (such as coming
|
|
||||||
# from ANGLE). The point of these find calls is to try to
|
|
||||||
# find the same binaries as Qt is compiled with (as they are
|
|
||||||
# in the interface of QtGui), so an effort is made to do so
|
|
||||||
# above with paths known to qmake.
|
|
||||||
set(_Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE TRUE)
|
|
||||||
unset(Qt5Gui_${_cmake_lib_name}_LIBRARY CACHE)
|
|
||||||
else()
|
|
||||||
add_library(Qt5::Gui_${_cmake_lib_name} SHARED IMPORTED)
|
|
||||||
set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_${Name}_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
|
||||||
_qt5_Gui_check_file_exists(\"${Qt5Gui_${_cmake_lib_name}_LIBRARY}\")
|
|
||||||
set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_LOCATION_RELEASE \"${Qt5Gui_${_cmake_lib_name}_LIBRARY}\")
|
|
||||||
|
|
||||||
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
|
|
||||||
set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_IMPLIB_RELEASE \"${Qt5Gui_${_cmake_lib_name}_LIBRARY}\")
|
|
||||||
!!ENDIF
|
|
||||||
unset(Qt5Gui_${_cmake_lib_name}_LIBRARY CACHE)
|
|
||||||
|
|
||||||
find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG ${_lib}d
|
|
||||||
PATHS \"${LibDir}\"
|
|
||||||
!!IF !mac
|
|
||||||
NO_DEFAULT_PATH
|
|
||||||
!!ENDIF
|
|
||||||
)
|
|
||||||
if (Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG)
|
|
||||||
set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
|
|
||||||
_qt5_Gui_check_file_exists(\"${Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG}\")
|
|
||||||
set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_LOCATION_DEBUG \"${Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG}\")
|
|
||||||
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
|
|
||||||
set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_IMPLIB_DEBUG \"${Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG}\")
|
|
||||||
!!ENDIF
|
|
||||||
endif()
|
|
||||||
unset(Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG CACHE)
|
|
||||||
list(APPEND Qt5Gui_${Name}_LIBRARIES Qt5::Gui_${_cmake_lib_name})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
|
|
||||||
!!IF !isEmpty(CMAKE_EGL_LIBS)
|
|
||||||
_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\")
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
!!IF !isEmpty(CMAKE_OPENGL_LIBS)
|
|
||||||
_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\")
|
|
||||||
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
!!ENDIF
|
|
||||||
|
|
||||||
set(Qt5Gui_OPENGL_IMPLEMENTATION $$CMAKE_QT_OPENGL_IMPLEMENTATION)
|
|
||||||
|
|
||||||
get_target_property(_configs Qt5::Gui IMPORTED_CONFIGURATIONS)
|
|
||||||
foreach(_config ${_configs})
|
|
||||||
set_property(TARGET Qt5::Gui APPEND PROPERTY
|
|
||||||
IMPORTED_LINK_DEPENDENT_LIBRARIES_${_config}
|
|
||||||
${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
|
|
||||||
)
|
|
||||||
endforeach()
|
|
||||||
unset(_configs)
|
|
||||||
Loading…
Reference in New Issue
Block a user