tami/gst-plugin-linescan
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: get CMake build working again to build in VS2012

Browse Source
This commit is contained in:
Joshua M. Doe
2014-09-05 11:16:45 -04:00
parent 87490ce952
commit 59bce030b0
33 changed files with 84 additions and 1501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/modules/FindGLIB2.cmake
View File

@@ -23,16 +23,16 @@ endif(NOT WIN32)
find_path(GLIB2_MAIN_INCLUDE_DIR glib.h
PATH_SUFFIXES glib-2.0
HINTS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_INCLUDEDIR})
HINTS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_INCLUDEDIR} $ENV{GSTREAMER_1_0_ROOT_X86}/include)
# search the glibconfig.h include dir under the same root where the library is found
find_library(GLIB2_LIBRARIES
NAMES glib-2.0
HINTS ${PKG_GLIB_LIBRARY_DIRS} ${PKG_GLIB_LIBDIR})
HINTS ${PKG_GLIB_LIBRARY_DIRS} ${PKG_GLIB_LIBDIR} $ENV{GSTREAMER_1_0_ROOT_X86}/lib)
find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
PATH_SUFFIXES glib-2.0/include ../lib/glib-2.0/include
HINTS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH})
HINTS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} ${CMAKE_SYSTEM_LIBRARY_PATH} $ENV{GSTREAMER_1_0_ROOT_X86}/lib)
set(GLIB2_INCLUDE_DIR ${GLIB2_MAIN_INCLUDE_DIR})

6
cmake/modules/FindGObject.cmake
View File

@@ -30,7 +30,7 @@ ENDIF (NOT WIN32)
FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h
HINTS ${PKG_GOBJECT2_INCLUDE_DIRS} ${PKG_GOBJECT2_INCLUDEDIR}
PATHS /usr/include/glib-2.0/
PATHS /usr/include/glib-2.0/ $ENV{GSTREAMER_1_0_ROOT_X86}/include
PATH_SUFFIXES glib-2.0
)
@@ -38,21 +38,25 @@ FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
)
FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
)
FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
)
FIND_LIBRARY(_GLibs NAMES glib-2.0
HINTS
${PKG_GOBJECT2_LIBRARY_DIRS}
${PKG_GOBJECT2_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
)
SET (GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs})

9
cmake/modules/FindGStreamer.cmake
View File

@@ -25,7 +25,7 @@ else()
set(GStreamer_FIND_QUIETLY FALSE)
endif()
set(GSTREAMER_ABI_VERSION "0.10")
set(GSTREAMER_ABI_VERSION "1.0")
# Find the main library
@@ -39,13 +39,12 @@ if (PKG_CONFIG_FOUND)
endif()
find_library(GSTREAMER_LIBRARY
NAMES gstreamer-${GSTREAMER_ABI_VERSION}
HINTS ${PKG_GSTREAMER_LIBRARY_DIRS} ${PKG_GSTREAMER_LIBDIR}
PATH_SUFFIXES .libs)
NAMES gstreamer-${GSTREAMER_ABI_VERSION}
HINTS ${PKG_GSTREAMER_LIBRARY_DIRS} ${PKG_GSTREAMER_LIBDIR} $ENV{GSTREAMER_1_0_ROOT_X86}/lib)
find_path(GSTREAMER_INCLUDE_DIR
gst/gst.h
HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR}
HINTS ${PKG_GSTREAMER_INCLUDE_DIRS} ${PKG_GSTREAMER_INCLUDEDIR} $ENV{GSTREAMER_1_0_ROOT_X86}/include
PATH_SUFFIXES gstreamer-${GSTREAMER_ABI_VERSION})
if (PKG_GSTREAMER_PLUGIN_DIR)

6
cmake/modules/FindGStreamerPluginsBase.cmake
View File

@@ -16,7 +16,7 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
set(GSTREAMER_ABI_VERSION "0.10")
set(GSTREAMER_ABI_VERSION "1.0")
# Find the pkg-config file for doing the version check
@@ -47,6 +47,10 @@ foreach(_component ${GStreamerPluginsBase_FIND_COMPONENTS})
_find_gst_plugins_base_component(FFT gstfft.h)
elseif (${_component} STREQUAL "floatcast")
_find_gst_plugins_base_component(FLOATCAST floatcast.h)
elseif (${_component} STREQUAL "interfaces")
_find_gst_plugins_base_component(INTERFACES xoverlay.h)
elseif (${_component} STREQUAL "insertbin")
_find_gst_plugins_base_component(INSERTBIN gstinsertbin.h)
elseif (${_component} STREQUAL "netbuffer")
_find_gst_plugins_base_component(NETBUFFER gstnetbuffer.h)
elseif (${_component} STREQUAL "riff")

39
cmake/modules/FindNIIMAQdx.cmake Normal file
View File

@@ -0,0 +1,39 @@
# - Try to find National Instruments IMAQdx
# Once done this will define
#
# NIIMAQDX_FOUND - system has NI-IMAQdx
# NIIMAQDX_INCLUDE_DIR - the NI-IMAQdx include directory
# NIIMAQDX_LIBRARIES - the libraries needed to use NI-IMAQdx
# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
# Copyright (c) 2010, United States Government, Joshua M. Doe <oss@nvl.army.mil>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (NOT NIIMAQDX_DIR)
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
if (_PROG_FILES_X86)
set(_PROGFILESDIR "${_PROG_FILES_X86}")
else ()
set(_PROGFILESDIR "${_PROG_FILES}")
endif ()
set (NIIMAQDX_DIR "${_PROGFILESDIR}/National Instruments" CACHE PATH "Directory containing NI includes and libraries")
endif ()
find_path (NIIMAQDX_INCLUDE_DIR NIIMAQdx.h
PATHS
"${NIIMAQDX_DIR}/Shared/ExternalCompilerSupport/C/Include"
DOC "Directory containing NIIMAQdx.h include file")
find_library (NIIMAQDX_LIBRARIES NAMES niimaqdx
PATHS
"${NIIMAQDX_DIR}/Shared/ExternalCompilerSupport/C/Lib32/MSVC"
DOC "NI-IMAQdx library to link with")
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (NIIMAQDX DEFAULT_MSG NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES)
MARK_AS_ADVANCED(NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES)

15
cmake/modules/MacroFindGStreamerLibrary.cmake
View File

@@ -20,22 +20,21 @@ macro(find_gstreamer_library _name _header _abi_version)
pkg_check_modules(PKG_GSTREAMER_${_upper_name} gstreamer-${_lower_name}-${_abi_version})
endif()
find_library(GSTREAMER_${_upper_name}_LIBRARY
NAMES gst${_lower_name}-${_abi_version}
HINTS ${PKG_GSTREAMER_${_upper_name}_LIBRARY_DIRS}
${PKG_GSTREAMER_${_upper_name}_LIBDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/lib
)
find_path(GSTREAMER_${_upper_name}_INCLUDE_DIR
gst/${_lower_name}/${_header}
HINTS ${PKG_GSTREAMER_${_upper_name}_INCLUDE_DIRS}
${PKG_GSTREAMER_${_upper_name}_INCLUDEDIR}
$ENV{GSTREAMER_1_0_ROOT_X86}/include
PATH_SUFFIXES gstreamer-${_abi_version}
)
find_library(GSTREAMER_${_upper_name}_LIBRARY
NAMES gst${_lower_name}-${_abi_version}
HINTS ${PKG_GSTREAMER_${_upper_name}_LIBRARY_DIRS}
${PKG_GSTREAMER_${_upper_name}_LIBDIR}
${GSTREAMER_${_upper_name}_INCLUDE_DIR}
PATH_SUFFIXES ./ .libs gst/${_lower_name}/.libs
)
if (GSTREAMER_${_upper_name}_LIBRARY AND GSTREAMER_${_upper_name}_INCLUDE_DIR)
set(GSTREAMER_${_upper_name}_LIBRARY_FOUND TRUE)
else()