diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:15:09 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:15:09 (GMT) |
| commit | 836927aa902696297febc95132e2c82147c08c03 (patch) | |
| tree | 64bcbaa67c6f70acdb5f4cc9184f600fad46b826 /contrib/cmake | |
| parent | f7ca1ebaa5a527f817892bc3794452df1a6c20c6 (diff) | |
| download | uscxml-836927aa902696297febc95132e2c82147c08c03.zip uscxml-836927aa902696297febc95132e2c82147c08c03.tar.gz uscxml-836927aa902696297febc95132e2c82147c08c03.tar.bz2 | |
Expect Invoker and Fedora build fixes
Diffstat (limited to 'contrib/cmake')
| -rw-r--r-- | contrib/cmake/FindFFMPEG.cmake | 10 | ||||
| -rw-r--r-- | contrib/cmake/FindPHP5.cmake | 4 | ||||
| -rw-r--r-- | contrib/cmake/FindSWI.cmake | 8 | ||||
| -rw-r--r-- | contrib/cmake/HeaderExists.cmake | 1 |
4 files changed, 20 insertions, 3 deletions
diff --git a/contrib/cmake/FindFFMPEG.cmake b/contrib/cmake/FindFFMPEG.cmake index 5f64790..261b283 100644 --- a/contrib/cmake/FindFFMPEG.cmake +++ b/contrib/cmake/FindFFMPEG.cmake @@ -160,5 +160,13 @@ IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODE ENDIF() INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFMPEG DEFAULT_MSG FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFMPEG DEFAULT_MSG + FFMPEG_LIBRARIES + FFMPEG_INCLUDE_DIRS + FFMPEG_LIBAVFORMAT_INCLUDE_DIRS + FFMPEG_LIBAVDEVICE_INCLUDE_DIRS + FFMPEG_LIBAVCODEC_INCLUDE_DIRS + FFMPEG_LIBAVUTIL_INCLUDE_DIRS + FFMPEG_LIBSWSCALE_INCLUDE_DIRS +) MARK_AS_ADVANCED(FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIR) diff --git a/contrib/cmake/FindPHP5.cmake b/contrib/cmake/FindPHP5.cmake index d449112..eee8e3f 100644 --- a/contrib/cmake/FindPHP5.cmake +++ b/contrib/cmake/FindPHP5.cmake @@ -1,4 +1,8 @@ if (UNIX) + if (APPLE) + # mavericks broke it - will look into it eventually + return() + endif() if (NOT PHP_CONFIG) find_program(PHP_CONFIG NAMES php-config diff --git a/contrib/cmake/FindSWI.cmake b/contrib/cmake/FindSWI.cmake index 1eb98cd..0953307 100644 --- a/contrib/cmake/FindSWI.cmake +++ b/contrib/cmake/FindSWI.cmake @@ -21,8 +21,12 @@ if (SWI_FOUND) # message("SWI_CFLAGS_OTHER_STATIC: ${SWI_CFLAGS_OTHER_STATIC}") # message(FATAL_ERROR "") - set(SWI_INCLUDE_DIR ${SWI_LIBRARY_DIRS}) - set(SWI_LIBRARY ${SWI_LIBRARIES}) + set(SWI_INCLUDE_DIR ${SWI_INCLUDE_DIRS}) + + FIND_LIBRARY(SWI_LIBRARY + NAMES libswipl swipl + PATHS ${SWI_LIBRARY_DIRS} + ) FIND_PROGRAM(SWI_BINARY swipl) diff --git a/contrib/cmake/HeaderExists.cmake b/contrib/cmake/HeaderExists.cmake index 9d0570e..810ac65 100644 --- a/contrib/cmake/HeaderExists.cmake +++ b/contrib/cmake/HeaderExists.cmake @@ -4,4 +4,5 @@ CHECK_INCLUDE_FILE(string.h HAS_STRING_H) CHECK_INCLUDE_FILE(signal.h HAS_SIGNAL_H) CHECK_INCLUDE_FILE(execinfo.h HAS_EXECINFO_H) CHECK_INCLUDE_FILE(dlfcn.h HAS_DLFCN_H) +CHECK_INCLUDE_FILE(stdint.h HAS_STDINT_H) |