From 3575163e6c9e7af8a98b2b6454d73e5ad7f7982a Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Fri, 10 Jul 2015 13:39:16 -0400 Subject: [PATCH] euresyssrc: update build to support 64-bit --- cmake/modules/FindEuresys.cmake | 48 +++++++++++++-------------------- sys/euresys/CMakeLists.txt | 7 ++--- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/cmake/modules/FindEuresys.cmake b/cmake/modules/FindEuresys.cmake index 771605f..4e950f8 100644 --- a/cmake/modules/FindEuresys.cmake +++ b/cmake/modules/FindEuresys.cmake @@ -6,45 +6,33 @@ # EURESYS_LIBRARIES - the libraries needed to use Euresys Multicam # Copyright (c) 2006, Tim Beaulen -# Copyright (c) 2011, United States Government, Joshua M. Doe +# Copyright (c) 2015, United States Government, Joshua M. Doe # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF (EURESYS_INCLUDE_DIR AND EURESYS_LIBRARIES) - # in cache already - SET(EURESYS_FIND_QUIETLY TRUE) -ELSE (EURESYS_INCLUDE_DIR AND EURESYS_LIBRARIES) - SET(EURESYS_FIND_QUIETLY FALSE) -ENDIF (EURESYS_INCLUDE_DIR AND EURESYS_LIBRARIES) +if (NOT EURESYS_DIR) + # Euresys seems to be installed in the 32-bit dir on 32- or 64-bit Windows + file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES) + + set (EURESYS_DIR "${_PROG_FILES}/Euresys/MultiCam" CACHE PATH "Directory containing Euresys Multicam includes and 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) - 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 +find_path (EURESYS_INCLUDE_DIR multicam.h PATHS "${EURESYS_DIR}/include" DOC "Directory containing multicam.h include file") -FIND_LIBRARY (EURESYS_LIBRARIES NAMES MultiCam +find_library (EURESYS_LIBRARIES NAMES MultiCam PATHS - "${EURESYS_DIR}/lib" + "${_LIB_PATH}" DOC "EURESYS library to link with") -IF (EURESYS_INCLUDE_DIR) - #MESSAGE(STATUS "DEBUG: Found Euresys Multicam include dir: ${EURESYS_INCLUDE_DIR}") -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) \ No newline at end of file +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (EURESYS DEFAULT_MSG EURESYS_INCLUDE_DIR EURESYS_LIBRARIES) \ No newline at end of file diff --git a/sys/euresys/CMakeLists.txt b/sys/euresys/CMakeLists.txt index b3e4593..036d760 100644 --- a/sys/euresys/CMakeLists.txt +++ b/sys/euresys/CMakeLists.txt @@ -1,10 +1,10 @@ add_definitions(-DHAVE_CONFIG_H) set ( SOURCES - gsteuresys.c ) + gsteuresyssrc.c ) set ( HEADERS - gsteuresys.h ) + gsteuresyssrc.h ) include_directories ( AFTER . @@ -16,7 +16,8 @@ add_library ( libgsteuresys MODULE target_link_libraries ( libgsteuresys ${GLIB2_LIBRARIES} - ${GSTREAMER_LIBRARIES} + ${GOBJECT_LIBRARIES} + ${GSTREAMER_LIBRARY} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_INTERFACE_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY}