From ab9f21cc1a957a1933e90ed8c1dfde8eac14726f Mon Sep 17 00:00:00 2001 From: "mcatanzaro@igalia.com" Date: Wed, 9 Aug 2017 23:32:14 +0000 Subject: [PATCH] [CMake] Remove unused find modules https://bugs.webkit.org/show_bug.cgi?id=175363 Reviewed by Carlos Alberto Lopez Perez. * Source/cmake/FindCFLite.cmake: Removed. * Source/cmake/FindClang.cmake: Removed. * Source/cmake/FindDBus.cmake: Removed. * Source/cmake/FindDirectX.cmake: Removed. * Source/cmake/FindEspeak.cmake: Removed. * Source/cmake/FindQuickTimeSDK.cmake: Removed. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220498 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 14 +++++++++ Source/cmake/FindCFLite.cmake | 18 ----------- Source/cmake/FindClang.cmake | 16 ---------- Source/cmake/FindDBus.cmake | 59 ------------------------------------- Source/cmake/FindDirectX.cmake | 29 ------------------ Source/cmake/FindEspeak.cmake | 42 -------------------------- Source/cmake/FindQuickTimeSDK.cmake | 20 ------------- 7 files changed, 14 insertions(+), 184 deletions(-) delete mode 100644 Source/cmake/FindCFLite.cmake delete mode 100644 Source/cmake/FindClang.cmake delete mode 100644 Source/cmake/FindDBus.cmake delete mode 100644 Source/cmake/FindDirectX.cmake delete mode 100644 Source/cmake/FindEspeak.cmake delete mode 100644 Source/cmake/FindQuickTimeSDK.cmake diff --git a/ChangeLog b/ChangeLog index 3cd9e34..816bccb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2017-08-09 Michael Catanzaro + + [CMake] Remove unused find modules + https://bugs.webkit.org/show_bug.cgi?id=175363 + + Reviewed by Carlos Alberto Lopez Perez. + + * Source/cmake/FindCFLite.cmake: Removed. + * Source/cmake/FindClang.cmake: Removed. + * Source/cmake/FindDBus.cmake: Removed. + * Source/cmake/FindDirectX.cmake: Removed. + * Source/cmake/FindEspeak.cmake: Removed. + * Source/cmake/FindQuickTimeSDK.cmake: Removed. + 2017-08-09 Zan Dobersek [WPE] Enable SUBTLE_CRYPTO in release builds diff --git a/Source/cmake/FindCFLite.cmake b/Source/cmake/FindCFLite.cmake deleted file mode 100644 index 71e7568..0000000 --- a/Source/cmake/FindCFLite.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# - Try to find the CFLite library -# Once done this will define -# -# CFLITE_FOUND - System has CFLite -# CFLITE_INCLUDE_DIR - The CFLite include directory -# CFLITE_LIBRARIES - The libraries needed to use CFLite - -find_path(CFLITE_INCLUDE_DIR NAMES CoreFoundation/CoreFoundation.h) - -find_library(CFLITE_LIBRARIES NAMES CFLite.lib) - -include(FindPackageHandleStandardArgs) - -# handle the QUIETLY and REQUIRED arguments and set COREFOUNDATION_FOUND to TRUE if -# all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(CFLite DEFAULT_MSG CFLITE_LIBRARIES CFLITE_INCLUDE_DIR) - -mark_as_advanced(CFLITE_INCLUDE_DIR CFLITE_LIBRARIES) diff --git a/Source/cmake/FindClang.cmake b/Source/cmake/FindClang.cmake deleted file mode 100644 index 1fc86bb..0000000 --- a/Source/cmake/FindClang.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# -# Check for Clang. -# -# The following variables are set: -# CLANG_EXE -# CLANG_VERSION - -find_program(CLANG_EXE NAMES "clang") - -execute_process(COMMAND ${CLANG_EXE} --version OUTPUT_VARIABLE CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(CLANG DEFAULT_MSG - CLANG_VERSION) - -mark_as_advanced(CLANG_VERSION) diff --git a/Source/cmake/FindDBus.cmake b/Source/cmake/FindDBus.cmake deleted file mode 100644 index f4752e8..0000000 --- a/Source/cmake/FindDBus.cmake +++ /dev/null @@ -1,59 +0,0 @@ -# - Try to find DBus -# Once done, this will define -# -# DBUS_FOUND - system has DBus -# DBUS_INCLUDE_DIRS - the DBus include directories -# DBUS_LIBRARIES - link these to use DBus -# -# Copyright (C) 2012 Raphael Kubo da Costa -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS -# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -find_package(PkgConfig) -pkg_check_modules(PC_DBUS QUIET dbus-1) - -find_library(DBUS_LIBRARIES - NAMES dbus-1 - HINTS ${PC_DBUS_LIBDIR} - ${PC_DBUS_LIBRARY_DIRS} -) - -find_path(DBUS_INCLUDE_DIR - NAMES dbus/dbus.h - HINTS ${PC_DBUS_INCLUDEDIR} - ${PC_DBUS_INCLUDE_DIRS} -) - -get_filename_component(_DBUS_LIBRARY_DIR ${DBUS_LIBRARIES} PATH) -find_path(DBUS_ARCH_INCLUDE_DIR - NAMES dbus/dbus-arch-deps.h - HINTS ${PC_DBUS_INCLUDEDIR} - ${PC_DBUS_INCLUDE_DIRS} - ${_DBUS_LIBRARY_DIR} - ${DBUS_INCLUDE_DIR} - PATH_SUFFIXES include -) - -set(DBUS_INCLUDE_DIRS ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR}) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBUS REQUIRED_VARS DBUS_INCLUDE_DIRS DBUS_LIBRARIES) diff --git a/Source/cmake/FindDirectX.cmake b/Source/cmake/FindDirectX.cmake deleted file mode 100644 index 7aac8d4..0000000 --- a/Source/cmake/FindDirectX.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# - Find DirectX SDK installation -# Find the DirectX includes and library -# This module defines -# DirectX_INCLUDE_DIRS, where to find d3d9.h, etc. -# DirectX_LIBRARIES, libraries to link against to use DirectX. -# DirectX_FOUND, If false, do not try to use DirectX. -# DirectX_ROOT_DIR, directory where DirectX was installed. - -find_path(DirectX_INCLUDE_DIRS d3d9.h PATHS - "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK*/Include" -) - -get_filename_component(DirectX_ROOT_DIR "${DirectX_INCLUDE_DIRS}/.." ABSOLUTE) - -if (CMAKE_CL_64) - set(DirectX_LIBRARY_PATHS "${DirectX_ROOT_DIR}/Lib/x64") -else () - set(DirectX_LIBRARY_PATHS "${DirectX_ROOT_DIR}/Lib/x86" "${DirectX_ROOT_DIR}/Lib") -endif () - -find_library(DirectX_D3D9_LIBRARY d3d9 ${DirectX_LIBRARY_PATHS} NO_DEFAULT_PATH) -find_library(DirectX_D3DX9_LIBRARY d3dx9 ${DirectX_LIBRARY_PATHS} NO_DEFAULT_PATH) -set(DirectX_LIBRARIES ${DirectX_D3D9_LIBRARY} ${DirectX_D3DX9_LIBRARY}) - -# handle the QUIETLY and REQUIRED arguments and set DirectX_FOUND to TRUE if all listed variables are TRUE -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(DirectX DEFAULT_MSG DirectX_ROOT_DIR DirectX_LIBRARIES DirectX_INCLUDE_DIRS) -mark_as_advanced(DirectX_INCLUDE_DIRS DirectX_D3D9_LIBRARY DirectX_D3DX9_LIBRARY) diff --git a/Source/cmake/FindEspeak.cmake b/Source/cmake/FindEspeak.cmake deleted file mode 100644 index d273b61..0000000 --- a/Source/cmake/FindEspeak.cmake +++ /dev/null @@ -1,42 +0,0 @@ -# - Try to find Espeak -# Once done, this will define -# -# ESPEAK_INCLUDE_DIRS - the Espeak include drectories -# ESPEAK_LIBRARIES - link these to use Espeak -# -# Copyright (C) 2014 Samsung Electronics -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``A -# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -find_path(ESPEAK_INCLUDE_DIRS - NAMES speak_lib.h - PATH_SUFFIXES espeak -) - -find_library(ESPEAK_LIBRARIES - NAMES espeak -) - -mark_as_advanced( - ESPEAK_INCLUDE_DIRS - ESPEAK_LIBRARIES -) diff --git a/Source/cmake/FindQuickTimeSDK.cmake b/Source/cmake/FindQuickTimeSDK.cmake deleted file mode 100644 index 389b67e..0000000 --- a/Source/cmake/FindQuickTimeSDK.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# - Find QuickTime SDK installation -# Find the QuickTime includes and library -# This module defines -# QuickTime_INCLUDE_DIRS, where to find QuickTime.h, etc. -# QuickTime_LIBRARIES, libraries to link against to use QuickTime. -# QuickTime_FOUND, If false, do not try to use QuickTime. - -find_path(QuickTimeSDK_INCLUDE_DIRS QuickTime.h PATHS - "$ENV{PROGRAMFILES}/QuickTime SDK/CIncludes" -) - -set(QuickTimeSDK_LIBRARY_PATH "${QuickTimeSDK_INCLUDE_DIRS}/../Libraries") -find_library(QuickTimeSDK_CVClient_LIBRARY CVClient ${QuickTimeSDK_LIBRARY_PATH} NO_DEFAULT_PATH) -find_library(QuickTimeSDK_QTMLClient_LIBRARY QTMLClient ${QuickTimeSDK_LIBRARY_PATH} NO_DEFAULT_PATH) -set(QuickTimeSDK_LIBRARIES ${QuickTimeSDK_CVClient_LIBRARY} ${QuickTimeSDK_QTMLClient_LIBRARY}) - -# handle the QUIETLY and REQUIRED arguments and set QuickTimeSDK_FOUND to TRUE if all listed variables are TRUE -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(QuickTimeSDK DEFAULT_MSG QuickTimeSDK_LIBRARIES QuickTimeSDK_INCLUDE_DIRS) -mark_as_advanced(QuickTimeSDK_INCLUDE_DIRS QuickTimeSDK_CVClient_LIBRARY QuickTimeSDK_QTMLClient_LIBRARY) -- 1.8.3.1