diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-29 12:39:25 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-29 12:39:25 (GMT) |
| commit | 86edde8c9a83e410848107e9e1ad6cc9968be8db (patch) | |
| tree | 4ef5bb7204db529d02ec268a9304312de9b750cc | |
| parent | 3aa5d5e04786c49c828191a8fed2f6a31f6520f2 (diff) | |
| download | uscxml-86edde8c9a83e410848107e9e1ad6cc9968be8db.zip uscxml-86edde8c9a83e410848107e9e1ad6cc9968be8db.tar.gz uscxml-86edde8c9a83e410848107e9e1ad6cc9968be8db.tar.bz2 | |
More miles fixes
| -rw-r--r-- | CMakeLists.txt | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6414e7d..f57582b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -740,25 +740,35 @@ if (NOT AUDIOTOOLBOX_FOUND) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) endif() -find_package(MILES COMPONENTS audio video core network session utils) +if (WIN32) + find_package(MILES) +else() + find_package(MILES COMPONENTS audio video core network session utils debug image) +endif() +#set(JPEG_ROOT_PATH "" CACHE STRING "Where to find libjpeg") if (MILES_FOUND) - # openal is only needed for miles - find_package(OpenAL) - find_package(JPEG) - find_package(ICONV) + if (NOT WIN32) + # openal is only needed for miles + find_package(OpenAL) + find_package(JPEG) + find_package(ICONV) - if (OPENAL_FOUND AND ICONV_FOUND AND JPEG_FOUND) + 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() + else() 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() |