Skip to content

Updated FindXCLIB to work on Linux #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
genevanmeter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated FindXCLIB to work on Linux #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 34 additions & 23 deletions cmake/modules/FindXCLIB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,55 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.

# TODO: properly handle Linux

if (NOT XCLIB_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)

if (CMAKE_SIZEOF_VOID_P MATCHES "8")
set(_PROGFILESDIR "${_PROG_FILES_W6432}")
else ()
if (_PROG_FILES_X86)
set(_PROGFILESDIR "${_PROG_FILES_X86}")
if (WIN32)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)

if (CMAKE_SIZEOF_VOID_P MATCHES "8")
set(_PROGFILESDIR "${_PROG_FILES_W6432}")
else ()
set(_PROGFILESDIR "${_PROG_FILES}")
if (_PROG_FILES_X86)
set(_PROGFILESDIR "${_PROG_FILES_X86}")
else ()
set(_PROGFILESDIR "${_PROG_FILES}")
endif ()
endif ()
endif ()

set (XCLIB_DIR "${_PROGFILESDIR}/EPIX/XCLIB" CACHE PATH "Directory containing EPIX PIXCI XCLIB includes and libraries")
set (XCLIB_DIR "${_PROGFILESDIR}/EPIX/XCLIB" CACHE PATH "Directory containing EPIX PIXCI XCLIB includes and libraries")
endif (WIN32)

if (UNIX)
find_path(XCLIB_DIR
"inc/xclibver.h"
HINTS
"/usr/local/xclib"
DOC "Directory containing EPIX PIXCI XCLIB includes and libraries")
endif (UNIX)
endif (NOT XCLIB_DIR)

find_path (XCLIB_INCLUDE_DIR xcliball.h
PATHS
HINTS
"${XCLIB_DIR}"
"${XCLIB_DIR}/inc"
DOC "Directory containing xcliball.h include file")

if (CMAKE_SIZEOF_VOID_P MATCHES "8")
find_library (XCLIB_LIBRARIES NAMES XCLIBW64
PATHS
find_library (XCLIB_LIBRARIES NAMES XCLIBW64 xclib_x86_64_pic.a xclib_aarch64_pic.a
HINTS
"${XCLIB_DIR}"
"${XCLIB_DIR}/lib"
DOC "XCLIB 64-bit library to link with")
else ()
find_library (XCLIB_LIBRARIES NAMES XCLIBWNT
PATHS
find_library (XCLIB_LIBRARIES NAMES XCLIBWNT xclib_i386_pic.a
HINTS
"${XCLIB_DIR}"
"${XCLIB_DIR}/lib"
DOC "XCLIB 32-bit library to link with")
endif ()

Expand Down
4 changes: 4 additions & 0 deletions sys/pixci/gstpixcisrc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@

#include <gst/base/gstpushsrc.h>

#ifdef WIN32
#include <windows.h>
#endif
#include <xcliball.h>

G_BEGIN_DECLS
Expand All @@ -44,9 +46,11 @@ typedef struct _GstPixciSrcClass GstPixciSrcClass;
*
* Identifies the connector that the camera is connected to.
*/
#ifndef __GNUC__
typedef enum {

} GstPixciSrcConnector;
#endif

typedef enum {
GST_PIXCI_VIDEO_FORMAT_CCIR,
Expand Down