Sync with Krypton branch

4 files changed, 4 insertions, 57 deletions

diff --git a/project/cmake/modules/FindCpluff.cmake b/project/cmake/modules/FindCpluff.cmake
index ce6c127..fb2bb25 100644
--- a/project/cmake/modules/FindCpluff.cmake
+++ b/project/cmake/modules/FindCpluff.cmake
@@ -10,13 +10,6 @@ if(NOT WIN32)
   string(REPLACE ";" " " defines "${CMAKE_C_FLAGS} ${SYSTEM_DEFINES} -I${EXPAT_INCLUDE_DIR}")
   get_filename_component(expat_dir ${EXPAT_LIBRARY} DIRECTORY)
   set(ldflags "-L${expat_dir}")
-
-  # iOS: Without specifying -arch, configure tries to use /bin/cpp as C-preprocessor
-  # http://stackoverflow.com/questions/38836754/cant-cross-compile-c-library-for-arm-ios
-  if(CORE_SYSTEM_NAME STREQUAL ios)
-    set(cppflags "-arch ${CPU}")
-  endif()
-
   ExternalProject_Add(libcpluff SOURCE_DIR ${CORE_SOURCE_DIR}/lib/cpluff
                       BUILD_IN_SOURCE 1
                       PREFIX ${CORE_BUILD_DIR}/cpluff
@@ -29,7 +22,6 @@ if(NOT WIN32)
                                         --libdir=<INSTALL_DIR>/lib
                                         --host=${ARCH}
                                         CFLAGS=${defines}
-                                        CPPFLAGS=${cppflags}
                                         LDFLAGS=${ldflags})
   ExternalProject_Add_Step(libcpluff autoreconf
                                      DEPENDEES download update patch
diff --git a/project/cmake/modules/FindCrossGUID.cmake b/project/cmake/modules/FindCrossGUID.cmake
index ba2823a..bcae3d3 100644
--- a/project/cmake/modules/FindCrossGUID.cmake
+++ b/project/cmake/modules/FindCrossGUID.cmake
@@ -16,10 +16,6 @@ if(ENABLE_INTERNAL_CROSSGUID)
     message(STATUS "CROSSGUID_URL: ${CROSSGUID_URL}")
   endif()
 
-  if(APPLE)
-    set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
-  endif()
-
   set(CROSSGUID_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libcrossguid.a)
   set(CROSSGUID_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
   externalproject_add(crossguid
@@ -28,7 +24,6 @@ if(ENABLE_INTERNAL_CROSSGUID)
                       PREFIX ${CORE_BUILD_DIR}/crossguid
                       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
                                  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-                                 "${EXTRA_ARGS}"
                       PATCH_COMMAND ${CMAKE_COMMAND} -E copy
                                     ${CORE_SOURCE_DIR}/tools/depends/target/crossguid/CMakeLists.txt
                                     <SOURCE_DIR> &&
diff --git a/project/cmake/modules/FindMir.cmake b/project/cmake/modules/FindMir.cmake
deleted file mode 100644
index 8847a61..0000000
--- a/project/cmake/modules/FindMir.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# FindMir
-# -------
-# Finds the Mir library
-#
-# This will will define the following variables::
-#
-# MIR_FOUND        - the system has Mir
-# MIR_INCLUDE_DIRS - the Mir include directory
-# MIR_LIBRARIES    - the Mir libraries
-# MIR_DEFINITIONS  - the Mir definitions
-
-
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules (PC_MIR mirclient QUIET)
-endif()
-
-find_path(MIR_INCLUDE_DIR NAMES mir_toolkit/mir_client_library.h
-                          PATHS ${PC_MIR_INCLUDE_DIRS})
-
-find_library(MIR_LIBRARY NAMES mirclient
-                         PATHS ${PC_MIR_LIBRARIES} ${PC_MIR_LIBRARY_DIRS})
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (MIR
-                                   REQUIRED_VARS MIR_LIBRARY MIR_INCLUDE_DIR)
-
-if (MIR_FOUND)
-  set(MIR_LIBRARIES ${MIR_LIBRARY})
-  set(MIR_INCLUDE_DIRS ${PC_MIR_INCLUDE_DIRS})
-  set(MIR_DEFINITIONS -DHAVE_MIR=1)
-endif()
-
-mark_as_advanced (MIR_LIBRARY MIR_INCLUDE_DIR)
diff --git a/project/cmake/modules/FindVAAPI.cmake b/project/cmake/modules/FindVAAPI.cmake
index ea9a3c9..ce3fe1a 100644
--- a/project/cmake/modules/FindVAAPI.cmake
+++ b/project/cmake/modules/FindVAAPI.cmake
@@ -24,8 +24,6 @@ find_library(VAAPI_libva_LIBRARY NAMES va
                                  PATHS ${PC_VAAPI_libva_LIBDIR})
 find_library(VAAPI_libva-x11_LIBRARY NAMES va-x11
                                      PATHS ${PC_VAAPI_libva_LIBDIR})
-find_library(VAAPI_libva-drm_LIBRARY NAMES va-drm
-                                     PATHS ${PC_VAAPI_libva_LIBDIR})
 
 if(PC_VAAPI_libva_VERSION)
   set(VAAPI_VERSION_STRING ${PC_VAAPI_libva_VERSION})
@@ -41,12 +39,12 @@ endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(VAAPI
-                                  REQUIRED_VARS VAAPI_libva_LIBRARY VAAPI_libva-x11_LIBRARY VAAPI_libva-drm_LIBRARY VAAPI_INCLUDE_DIR
+                                  REQUIRED_VARS VAAPI_libva_LIBRARY VAAPI_libva-x11_LIBRARY VAAPI_INCLUDE_DIR
                                   VERSION_VAR VAAPI_VERSION_STRING)
 
 if(VAAPI_FOUND)
   set(VAAPI_INCLUDE_DIRS ${VAAPI_INCLUDE_DIR})
-  set(VAAPI_LIBRARIES ${VAAPI_libva_LIBRARY} ${VAAPI_libva-x11_LIBRARY} ${VAAPI_libva-drm_LIBRARY})
+  set(VAAPI_LIBRARIES ${VAAPI_libva_LIBRARY} ${VAAPI_libva-x11_LIBRARY})
   set(VAAPI_DEFINITIONS -DHAVE_LIBVA=1)
 
   if(NOT TARGET VAAPI::VAAPI_X11)
@@ -54,19 +52,14 @@ if(VAAPI_FOUND)
     set_target_properties(VAAPI::VAAPI_X11 PROPERTIES
                                            IMPORTED_LOCATION "${VAAPI_libva-x11_LIBRARY}")
   endif()
-  if (NOT TARGET VAAPI::VAAPI_DRM)
-    add_library(VAAPI::VAAPI_DRM UNKNOWN IMPORTED)
-    set_target_properties(VAAPI::VAAPI_DRM PROPERTIES
-                                           IMPORTED_LOCATION "${VAAPI_libva-drm_LIBRARY}")
-  endif()
   if(NOT TARGET VAAPI::VAAPI)
     add_library(VAAPI::VAAPI UNKNOWN IMPORTED)
     set_target_properties(VAAPI::VAAPI PROPERTIES
                                        IMPORTED_LOCATION "${VAAPI_libva_LIBRARY}"
                                        INTERFACE_INCLUDE_DIRECTORIES "${VAAPI_INCLUDE_DIR}"
                                        INTERFACE_COMPILE_DEFINITIONS HAVE_LIBVA=1
-                                       INTERFACE_LINK_LIBRARIES "VAAPI::VAAPI_X11 VAAPI::VAAPI_DRM")
+                                       INTERFACE_LINK_LIBRARIES VAAPI::VAAPI_X11)
   endif()
 endif()
 
-mark_as_advanced(VAAPI_INCLUDE_DIR VAAPI_libva_LIBRARY VAAPI_libva-x11_LIBRARY VAAPI_libva-drm_LIBRARY)
+mark_as_advanced(VAAPI_INCLUDE_DIR VAAPI_libva_LIBRARY VAAPI_libva-x11_LIBRARY)