From 4e24b69eaa2a2f4531a2732282a68ca113782784 Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Tue, 26 Sep 2017 09:28:29 -0400 Subject: [PATCH] build: allow GSTREAMER_ROOT to be set manually --- cmake/modules/FindGLIB2.cmake | 10 ++++++---- cmake/modules/FindGObject.cmake | 10 ++++++---- cmake/modules/FindGStreamer.cmake | 10 ++++++---- cmake/modules/FindOrc.cmake | 10 ++++++---- cmake/modules/MacroFindGStreamerLibrary.cmake | 10 ++++++---- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index 0fcb68d..d4e1db6 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -21,10 +21,12 @@ if (NOT WIN32) pkg_check_modules(PKG_GLIB REQUIRED glib-2.0) endif(NOT WIN32) -if (CMAKE_SIZEOF_VOID_P MATCHES "8") - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) -else () - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) +if (NOT GSTREAMER_ROOT) + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) + else () + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) + endif () endif () find_path(GLIB2_MAIN_INCLUDE_DIR glib.h diff --git a/cmake/modules/FindGObject.cmake b/cmake/modules/FindGObject.cmake index 54ede64..43787c0 100644 --- a/cmake/modules/FindGObject.cmake +++ b/cmake/modules/FindGObject.cmake @@ -28,10 +28,12 @@ IF (NOT WIN32) SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS}) ENDIF (NOT WIN32) -if (CMAKE_SIZEOF_VOID_P MATCHES "8") - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) -else () - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) +if (NOT GSTREAMER_ROOT) + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) + else () + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) + endif () endif () FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake index 6a1323d..0e0ae17 100644 --- a/cmake/modules/FindGStreamer.cmake +++ b/cmake/modules/FindGStreamer.cmake @@ -38,10 +38,12 @@ if (PKG_CONFIG_FOUND) OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) endif() -if (CMAKE_SIZEOF_VOID_P MATCHES "8") - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) -else () - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) +if (NOT GSTREAMER_ROOT) + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) + else () + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) + endif () endif () find_library(GSTREAMER_LIBRARY diff --git a/cmake/modules/FindOrc.cmake b/cmake/modules/FindOrc.cmake index a759696..5a6e2ed 100644 --- a/cmake/modules/FindOrc.cmake +++ b/cmake/modules/FindOrc.cmake @@ -16,10 +16,12 @@ if (NOT WIN32) pkg_check_modules(PKG_ORC REQUIRED orc-0.4) endif(NOT WIN32) -if (CMAKE_SIZEOF_VOID_P MATCHES "8") - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) -else () - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) +if (NOT GSTREAMER_ROOT) + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) + else () + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) + endif () endif () find_path(ORC_INCLUDE_DIR orc/orc.h diff --git a/cmake/modules/MacroFindGStreamerLibrary.cmake b/cmake/modules/MacroFindGStreamerLibrary.cmake index 76bc3e1..3f0cda2 100644 --- a/cmake/modules/MacroFindGStreamerLibrary.cmake +++ b/cmake/modules/MacroFindGStreamerLibrary.cmake @@ -20,10 +20,12 @@ macro(find_gstreamer_library _name _header _abi_version) pkg_check_modules(PKG_GSTREAMER_${_upper_name} gstreamer-${_lower_name}-${_abi_version}) endif() - if (CMAKE_SIZEOF_VOID_P MATCHES "8") - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) - else () - set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) + if (NOT GSTREAMER_ROOT) + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86_64}) + else () + set(GSTREAMER_ROOT $ENV{GSTREAMER_1_0_ROOT_X86}) + endif () endif () find_library(GSTREAMER_${_upper_name}_LIBRARY