From 7090a71814f99d490d93663e6659267b375bbe4c Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Thu, 6 Feb 2014 19:47:13 -0200 Subject: [PATCH] Remove Findpkg files for EFL. We are upgrading to use EFL 1.8, and that version already provides the cmakeconfig files needed to check for EFL version. So there's no need to keep them in our tree anymore. Change-Id: I486cb5e26a23989934219b0e8196eb6a10386a71 Signed-off-by: Rafael Antognolli --- Source/WTF/wtf/PlatformEfl.cmake | 1 + Source/cmake/FindEFREET.cmake | 30 ------------- Source/cmake/FindELEMENTARY.cmake | 18 -------- Source/cmake/FindETHUMB.cmake | 30 ------------- Source/cmake/FindEcore.cmake | 94 --------------------------------------- Source/cmake/FindEdje.cmake | 46 ------------------- Source/cmake/FindEeze.cmake | 41 ----------------- Source/cmake/FindEfreet.cmake | 41 ----------------- Source/cmake/FindEina.cmake | 41 ----------------- Source/cmake/FindEvas.cmake | 41 ----------------- Source/cmake/OptionsTizen.cmake | 8 ++-- 11 files changed, 5 insertions(+), 386 deletions(-) delete mode 100755 Source/cmake/FindEFREET.cmake delete mode 100755 Source/cmake/FindELEMENTARY.cmake delete mode 100755 Source/cmake/FindETHUMB.cmake delete mode 100644 Source/cmake/FindEcore.cmake delete mode 100644 Source/cmake/FindEdje.cmake delete mode 100644 Source/cmake/FindEeze.cmake delete mode 100644 Source/cmake/FindEfreet.cmake delete mode 100644 Source/cmake/FindEina.cmake delete mode 100644 Source/cmake/FindEvas.cmake diff --git a/Source/WTF/wtf/PlatformEfl.cmake b/Source/WTF/wtf/PlatformEfl.cmake index 88fa162..586628d 100755 --- a/Source/WTF/wtf/PlatformEfl.cmake +++ b/Source/WTF/wtf/PlatformEfl.cmake @@ -42,6 +42,7 @@ LIST(APPEND WTF_LIBRARIES LIST(APPEND WTF_INCLUDE_DIRECTORIES ${ECORE_INCLUDE_DIRS} ${ECORE_EVAS_INCLUDE_DIRS} + ${ECORE_IMF_INCLUDE_DIRS} ${EINA_INCLUDE_DIRS} ${EVAS_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} diff --git a/Source/cmake/FindEFREET.cmake b/Source/cmake/FindEFREET.cmake deleted file mode 100755 index ec6f7cb..0000000 --- a/Source/cmake/FindEFREET.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# - Try to find EFREET -# Once done, this will define -# -# EFREET_FOUND - system has efreet -# EFREET_INCLUDE_DIRS - the efreet include directories -# EFREET_LIBRARIES - link these to use efreet - -include(LibFindMacros) - -# Use pkg-config to get hints about paths -libfind_pkg_check_modules(EFREET_PKGCONF efreet) - -# Include dir -find_path(EFREET_INCLUDE_DIR - NAMES Efreet.h - PATHS ${EFREET_PKGCONF_INCLUDE_DIRS} -) - -# Finally the library itself -find_library(EFREET_LIBRARY - NAMES efreet - PATHS ${EFREET_PKGCONF_LIBRARY_DIRS} -) - -# Set the include dir variables and the libraries and let libfind_process do the rest. -# NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(EFREET_PROCESS_INCLUDES EFREET_INCLUDE_DIR EFREET_INCLUDE_DIRS) -set(EFREET_PROCESS_LIBS EFREET_LIBRARY EFREET_LIBRARIES) -libfind_process(EFREET) - diff --git a/Source/cmake/FindELEMENTARY.cmake b/Source/cmake/FindELEMENTARY.cmake deleted file mode 100755 index a92b9a6..0000000 --- a/Source/cmake/FindELEMENTARY.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# - Try to find ELEMENTARY -# Once done, this will define -# -# ELEMENTARY_FOUND - system has libelm -# ELEMENTARY_INCLUDE_DIRS - the libelm include directories -# ELEMENTARY_LIBRARIES - link these to use libelm - -include(LibFindMacros) - -# Use pkg-config to get hints about paths -libfind_pkg_check_modules(ELEMENTARY_PKGCONF elementary) - -# Set the include dir variables and the libraries and let libfind_process do the rest. -# NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(ELEMENTARY_PROCESS_INCLUDES ELEMENTARY_PKGCONF_INCLUDE_DIRS) -set(ELEMENTARY_PROCESS_LIBS ELEMENTARY_PKGCONF_LIBRARIES) -libfind_process(ELEMENTARY) - diff --git a/Source/cmake/FindETHUMB.cmake b/Source/cmake/FindETHUMB.cmake deleted file mode 100755 index a081f94..0000000 --- a/Source/cmake/FindETHUMB.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# - Try to find ETHUMB -# Once done, this will define -# -# ETHUMB_FOUND - system has libethumb -# ETHUMB_INCLUDE_DIRS - the libethumb include directories -# ETHUMB_LIBRARIES - link these to use libethumb - -include(LibFindMacros) - -# Use pkg-config to get hints about paths -libfind_pkg_check_modules(ETHUMB_PKGCONF ethumb) - -# Include dir -find_path(ETHUMB_INCLUDE_DIR - NAMES Ethumb.h - PATHS ${ETHUMB_PKGCONF_INCLUDE_DIRS} -) - -# Finally the library itself -find_library(ETHUMB_LIBRARY - NAMES ethumb - PATHS ${ETHUMB_PKGCONF_LIBRARY_DIRS} -) - -# Set the include dir variables and the libraries and let libfind_process do the rest. -# NOTE: Singular variables for this library, plural for libraries this this lib depends on. -set(ETHUMB_PROCESS_INCLUDES ETHUMB_INCLUDE_DIR ETHUMB_INCLUDE_DIRS) -set(ETHUMB_PROCESS_LIBS ETHUMB_LIBRARY ETHUMB_LIBRARIES) -libfind_process(ETHUMB) - diff --git a/Source/cmake/FindEcore.cmake b/Source/cmake/FindEcore.cmake deleted file mode 100644 index 35d25e4..0000000 --- a/Source/cmake/FindEcore.cmake +++ /dev/null @@ -1,94 +0,0 @@ -# - Try to find Ecore -# Once done, this will define -# -# ECORE_FOUND - system has Ecore installed. -# ECORE_INCLUDE_DIRS - directories which contain the Ecore headers. -# ECORE_LIBRARIES - libraries required to link against Ecore. -# -# Optionally, the COMPONENTS keyword can be passed to FIND_PACKAGE() -# and additional Ecore libraries can be looked for. Currently, the -# following libraries can be searched, and they define the following -# variables if found: -# -# EVAS - ECORE_EVAS_INCLUDE_DIRS and ECORE_EVAS_LIBRARIES -# FILE - ECORE_FILE_INCLUDE_DIRS and ECORE_FILE_LIBRARIES -# INPUT - ECORE_INPUT_INCLUDE_DIRS and ECORE_INPUT_LIBRARIES -# X - When using X, ECORE_X_INCLUDE_DIRS and ECORE_X_LIBRARIES -# WAYLAND - When using Wayland, ECORE_WAYLAND_INCLUDE_DIRS and ECORE_WAYLAND_LIBRARIES -# -# Copyright (C) 2012 Intel Corporation. All rights reserved. -# -# 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. - -INCLUDE(EFLHelpers) - -FIND_EFL_LIBRARY(ECORE - HEADERS Ecore.h - HEADER_PREFIXES ecore-1 - LIBRARY ecore -) - -# Components. -FIND_EFL_LIBRARY(ECORE_EVAS - HEADERS Ecore_Evas.h - HEADER_PREFIXES ecore-1 - LIBRARY ecore_evas -) -FIND_EFL_LIBRARY(ECORE_FILE - HEADERS Ecore_File.h - HEADER_PREFIXES ecore-1 - LIBRARY ecore_file -) -FIND_EFL_LIBRARY(ECORE_INPUT - HEADERS Ecore_Input.h - HEADER_PREFIXES ecore-1 - LIBRARY ecore_input -) -IF (ENABLE_ECORE_X) - FIND_EFL_LIBRARY(ECORE_X - HEADERS Ecore_X.h - HEADER_PREFIXES ecore-1 - LIBRARY ecore_x - ) -ELSE() - FIND_EFL_LIBRARY(ECORE_WAYLAND - HEADERS Ecore_Wayland.h - HEADER_PREFIXES ecore-1 - LIBRARY ecore_wayland - ) -ENDIF() -FIND_EFL_LIBRARY(ECORE_IMF - HEADERS Ecore_IMF.h Ecore_IMF_Evas.h - HEADER_PREFIXES ecore-1 - LIBRARY ecore_imf -) - -FOREACH(_component ${Ecore_FIND_COMPONENTS}) - SET(_ecore_component "ECORE_${_component}") - STRING(TOUPPER ${_ecore_component} _UPPER_NAME) - - LIST(APPEND _ECORE_REQUIRED_COMPONENT_VARS ${_UPPER_NAME}_INCLUDE_DIRS ${_UPPER_NAME}_LIBRARIES) -ENDFOREACH() - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ecore REQUIRED_VARS ECORE_INCLUDE_DIRS ECORE_LIBRARIES ${_ECORE_REQUIRED_COMPONENT_VARS} - VERSION_VAR ECORE_VERSION) diff --git a/Source/cmake/FindEdje.cmake b/Source/cmake/FindEdje.cmake deleted file mode 100644 index 01ff8d8..0000000 --- a/Source/cmake/FindEdje.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# - Try to find Edje -# Once done, this will define -# -# EDJE_FOUND - system has Edje installed. -# EDJE_INCLUDE_DIRS - directories which contain the Edje headers. -# EDJE_LIBRARIES - libraries required to link against Edje. -# EDJE_CC_EXECUTABLE - full path to the `edje_cc' program. -# -# Copyright (C) 2012 Intel Corporation. All rights reserved. -# -# 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. - -INCLUDE(EFLHelpers) - -FIND_EFL_LIBRARY(EDJE - HEADERS Edje.h - HEADER_PREFIXES edje-1 - LIBRARY edje -) - -FIND_PROGRAM(EDJE_CC_EXECUTABLE - NAMES edje_cc -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Edje REQUIRED_VARS EDJE_INCLUDE_DIRS EDJE_LIBRARIES EDJE_CC_EXECUTABLE - VERSION_VAR EDJE_VERSION) diff --git a/Source/cmake/FindEeze.cmake b/Source/cmake/FindEeze.cmake deleted file mode 100644 index 93edc48..0000000 --- a/Source/cmake/FindEeze.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# - Try to find Eeze -# Once done, this will define -# -# EEZE_FOUND - system has Eeze installed. -# EEZE_INCLUDE_DIRS - directories which contain the Eeze headers. -# EEZE_LIBRARIES - libraries required to link against Eeze. -# -# Copyright (C) 2012 Intel Corporation. All rights reserved. -# -# 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. - -INCLUDE(EFLHelpers) - -FIND_EFL_LIBRARY(EEZE - HEADERS Eeze.h - HEADER_PREFIXES eeze-1 - LIBRARY eeze -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eeze REQUIRED_VARS EEZE_INCLUDE_DIRS EEZE_LIBRARIES - VERSION_VAR EEZE_VERSION) diff --git a/Source/cmake/FindEfreet.cmake b/Source/cmake/FindEfreet.cmake deleted file mode 100644 index 22d704b..0000000 --- a/Source/cmake/FindEfreet.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# - Try to find Efreet -# Once done, this will define -# -# EFREET_FOUND - system has Efreet installed. -# EFREET_INCLUDE_DIRS - directories which contain the Efreet headers. -# EFREET_LIBRARIES - libraries required to link against Efreet. -# -# Copyright (C) 2012 Intel Corporation. All rights reserved. -# -# 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. - -INCLUDE(EFLHelpers) - -FIND_EFL_LIBRARY(EFREET - HEADERS Efreet.h - HEADER_PREFIXES efreet-1 - LIBRARY efreet -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Efreet REQUIRED_VARS EFREET_INCLUDE_DIRS EFREET_LIBRARIES - VERSION_VAR EFREET_VERSION) diff --git a/Source/cmake/FindEina.cmake b/Source/cmake/FindEina.cmake deleted file mode 100644 index 5ac9480..0000000 --- a/Source/cmake/FindEina.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# - Try to find Eina -# Once done, this will define -# -# EINA_FOUND - system has Eina installed. -# EINA_INCLUDE_DIRS - directories which contain the Eina headers. -# EINA_LIBRARIES - libraries required to link against Eina. -# -# Copyright (C) 2012 Intel Corporation. All rights reserved. -# -# 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. - -INCLUDE(EFLHelpers) - -FIND_EFL_LIBRARY(EINA - HEADERS Eina.h eina_main.h - HEADER_PREFIXES eina-1 eina-1/eina - LIBRARY eina -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eina REQUIRED_VARS EINA_INCLUDE_DIRS EINA_LIBRARIES - VERSION_VAR EINA_VERSION) diff --git a/Source/cmake/FindEvas.cmake b/Source/cmake/FindEvas.cmake deleted file mode 100644 index ce75eae..0000000 --- a/Source/cmake/FindEvas.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# - Try to find Evas -# Once done, this will define -# -# EVAS_FOUND - system has Evas installed. -# EVAS_INCLUDE_DIRS - directories which contain the Evas headers. -# EVAS_LIBRARIES - libraries required to link against Evas. -# -# Copyright (C) 2012 Intel Corporation. All rights reserved. -# -# 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. - -INCLUDE(EFLHelpers) - -FIND_EFL_LIBRARY(EVAS - HEADERS Evas.h - HEADER_PREFIXES evas-1 - LIBRARY evas -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Evas REQUIRED_VARS EVAS_INCLUDE_DIRS EVAS_LIBRARIES - VERSION_VAR EVAS_VERSION) diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake index 55f5629..7531396 100644 --- a/Source/cmake/OptionsTizen.cmake +++ b/Source/cmake/OptionsTizen.cmake @@ -247,9 +247,9 @@ TIZEN_OPTION_EXPAND(ENABLE_STYLE_SCOPED) MESSAGE("Checking Tizen dependencies...") FIND_PACKAGE(CAPI REQUIRED) FIND_PACKAGE(Dlog) -FIND_PACKAGE(EFREET REQUIRED) -FIND_PACKAGE(ELEMENTARY REQUIRED) -FIND_PACKAGE(ETHUMB REQUIRED) +FIND_PACKAGE(Efreet REQUIRED) +FIND_PACKAGE(Elementary REQUIRED) +FIND_PACKAGE(Ethumb REQUIRED) FIND_PACKAGE(EDBUS REQUIRED) FIND_PACKAGE(DBUS-1 REQUIRED) FIND_PACKAGE(GLES REQUIRED) @@ -438,7 +438,7 @@ ENDIF () FIND_PACKAGE(Eina 1.2 REQUIRED) FIND_PACKAGE(Evas 1.0 REQUIRED) -FIND_PACKAGE(Ecore 1.2 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS}) +FIND_PACKAGE(Ecore 1.2 COMPONENTS Evas File Input Imf ${ECORE_ADDITIONAL_COMPONENTS}) FIND_PACKAGE(Edje 1.0 REQUIRED) FIND_PACKAGE(Eeze 1.2 REQUIRED) #FIND_PACKAGE(Efreet 1.0 REQUIRED) -- 2.7.4