diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-29 11:22:54 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-29 11:22:54 (GMT) |
| commit | 1ad01fcefad64f29268e0ed6a2f0068212f37a2f (patch) | |
| tree | bb8afa3856b1958f79d3252d6411eb475caee908 /CMakeLists.txt | |
| parent | 944c17d31993cdf6a651f6a40ca0f7ea02100bd3 (diff) | |
| download | uscxml-1ad01fcefad64f29268e0ed6a2f0068212f37a2f.zip uscxml-1ad01fcefad64f29268e0ed6a2f0068212f37a2f.tar.gz uscxml-1ad01fcefad64f29268e0ed6a2f0068212f37a2f.tar.bz2 | |
Fixed miles library inclusion on linux
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index facdd3d..30187d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -740,18 +740,26 @@ if (NOT AUDIOTOOLBOX_FOUND) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) endif() -find_package(MILES) +find_package(MILES COMPONENTS audio video core) if (MILES_FOUND) + # openal is only needed for miles find_package(OpenAL) find_package(JPEG) - list (APPEND MILES_LIBRARIES "iconv") - list (APPEND MILES_LIBRARIES ${JPEG_LIBRARIES}) - list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR}) - - include_directories (${MILES_INCLUDE_DIR}) - list (APPEND USCXML_OPT_LIBS ${MILES_LIBRARIES}) - # list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) + find_package(ICONV) + + if (OPENAL_FOUND AND ICONV_FOUND AND JPEG_FOUND) + include_directories (${MILES_INCLUDE_DIR}) + list (APPEND USCXML_OPT_LIBS ${MILES_LIBRARIES}) + include_directories (${ICONV_INCLUDE_DIR}) + list (APPEND USCXML_OPT_LIBS ${ICONV_LIBRARIES}) + include_directories (${JPEG_INCLUDE_DIR}) + list (APPEND USCXML_OPT_LIBS ${JPEG_LIBRARIES}) + include_directories (${OPENAL_INCLUDE_DIR}) + list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) + else() + set(MILES_FOUND OFF) + endif() endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) |