euresyssrc: update build to support 64-bit

This commit is contained in:
Joshua M. Doe 2015-07-10 13:39:16 -04:00
parent ce0fea1142
commit 3575163e6c
2 changed files with 22 additions and 33 deletions

View File

@ -6,45 +6,33 @@
# EURESYS_LIBRARIES - the libraries needed to use Euresys Multicam # EURESYS_LIBRARIES - the libraries needed to use Euresys Multicam
# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com> # Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com>
# Copyright (c) 2011, United States Government, Joshua M. Doe <oss@nvl.army.mil> # Copyright (c) 2015, United States Government, Joshua M. Doe <oss@nvl.army.mil>
# #
# Redistribution and use is allowed according to the terms of the BSD license. # Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
IF (EURESYS_INCLUDE_DIR AND EURESYS_LIBRARIES) if (NOT EURESYS_DIR)
# in cache already # Euresys seems to be installed in the 32-bit dir on 32- or 64-bit Windows
SET(EURESYS_FIND_QUIETLY TRUE) file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
ELSE (EURESYS_INCLUDE_DIR AND EURESYS_LIBRARIES)
SET(EURESYS_FIND_QUIETLY FALSE) set (EURESYS_DIR "${_PROG_FILES}/Euresys/MultiCam" CACHE PATH "Directory containing Euresys Multicam includes and libraries")
ENDIF (EURESYS_INCLUDE_DIR AND EURESYS_LIBRARIES)
if (CMAKE_SIZEOF_VOID_P MATCHES "8")
set(_LIB_PATH "${EURESYS_DIR}/lib/amd64")
else ()
set(_LIB_PATH "${EURESYS_DIR}/lib")
endif ()
endif ()
IF (NOT EURESYS_DIR) find_path (EURESYS_INCLUDE_DIR multicam.h
SET (EURESYS_DIR "C:/Program Files/Euresys/MultiCam" CACHE PATH "Directory containing Euresys Multicam includes and libraries")
ENDIF (NOT EURESYS_DIR)
FIND_PATH (EURESYS_INCLUDE_DIR multicam.h
PATHS PATHS
"${EURESYS_DIR}/include" "${EURESYS_DIR}/include"
DOC "Directory containing multicam.h include file") DOC "Directory containing multicam.h include file")
FIND_LIBRARY (EURESYS_LIBRARIES NAMES MultiCam find_library (EURESYS_LIBRARIES NAMES MultiCam
PATHS PATHS
"${EURESYS_DIR}/lib" "${_LIB_PATH}"
DOC "EURESYS library to link with") DOC "EURESYS library to link with")
IF (EURESYS_INCLUDE_DIR) include (FindPackageHandleStandardArgs)
#MESSAGE(STATUS "DEBUG: Found Euresys Multicam include dir: ${EURESYS_INCLUDE_DIR}") find_package_handle_standard_args (EURESYS DEFAULT_MSG EURESYS_INCLUDE_DIR EURESYS_LIBRARIES)
ELSE (EURESYS_INCLUDE_DIR)
MESSAGE(STATUS "EURESYS: WARNING: include dir not found")
ENDIF (EURESYS_INCLUDE_DIR)
IF (EURESYS_LIBRARIES)
#MESSAGE(STATUS "DEBUG: Found Euresys Multicam library: ${EURESYS_LIBRARIES}")
ELSE (EURESYS_LIBRARIES)
MESSAGE(STATUS "EURESYS: WARNING: library not found")
ENDIF (EURESYS_LIBRARIES)
INCLUDE (FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS (EURESYS DEFAULT_MSG EURESYS_INCLUDE_DIR EURESYS_LIBRARIES)
MARK_AS_ADVANCED(EURESYS_INCLUDE_DIR EURESYS_LIBRARIES)

View File

@ -1,10 +1,10 @@
add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H)
set ( SOURCES set ( SOURCES
gsteuresys.c ) gsteuresyssrc.c )
set ( HEADERS set ( HEADERS
gsteuresys.h ) gsteuresyssrc.h )
include_directories ( AFTER include_directories ( AFTER
. .
@ -16,7 +16,8 @@ add_library ( libgsteuresys MODULE
target_link_libraries ( libgsteuresys target_link_libraries ( libgsteuresys
${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}
${GSTREAMER_LIBRARIES} ${GOBJECT_LIBRARIES}
${GSTREAMER_LIBRARY}
${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_BASE_LIBRARY}
${GSTREAMER_INTERFACE_LIBRARY} ${GSTREAMER_INTERFACE_LIBRARY}
${GSTREAMER_VIDEO_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY}