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 /CMakeLists.txt | |
| parent | f7ca1ebaa5a527f817892bc3794452df1a6c20c6 (diff) | |
| download | uscxml-836927aa902696297febc95132e2c82147c08c03.zip uscxml-836927aa902696297febc95132e2c82147c08c03.tar.gz uscxml-836927aa902696297febc95132e2c82147c08c03.tar.bz2 | |
Expect Invoker and Fedora build fixes
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b05df3..789b231 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,7 +672,7 @@ endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(FFMPEG) if (FFMPEG_FOUND) - include_directories (${FFMPEG_INCLUDE_DIR}) + include_directories (${FFMPEG_INCLUDE_DIRS}) list (APPEND USCXML_OPT_LIBS ${FFMPEG_LIBRARIES}) # required with static ffmpeg builds # set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic") @@ -687,6 +687,15 @@ if (LIBICAL_FOUND) endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) +find_package(EXPECT) +find_package(TCL) +if (EXPECT_FOUND AND TCL_FOUND) + include_directories (${EXPECT_INCLUDE_DIR}) + include_directories (${TCL_INCLUDE_PATH}) + list (APPEND USCXML_OPT_LIBS ${EXPECT_LIBRARY}) + list (APPEND USCXML_OPT_LIBS ${TCL_LIBRARY}) +endif() + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(LibPurple) if (LIBPURPLE_FOUND) |