diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-07-03 15:29:32 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-07-03 15:29:32 (GMT) |
| commit | 096f7df1137dd62871cacd371bf023e39d6b30e5 (patch) | |
| tree | e1fa0dc079698d700e6323dcc7769169142a236e /CMakeLists.txt | |
| parent | 8941cc07d4df9c112744e58a9108fcf5575fa9d6 (diff) | |
| download | uscxml-096f7df1137dd62871cacd371bf023e39d6b30e5.zip uscxml-096f7df1137dd62871cacd371bf023e39d6b30e5.tar.gz uscxml-096f7df1137dd62871cacd371bf023e39d6b30e5.tar.bz2 | |
Reactiveted miles components and some JSC fixes
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 814c099..68dc2d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -526,7 +526,14 @@ if (UNIX) endif() find_package(MILES) -if (MILES_FOUND AND OFF) +if (MILES_FOUND) + # openal is only needed for miles + find_package(OpenAL REQUIRED) + find_package(JPEG REQUIRED) + 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}) @@ -597,8 +604,6 @@ if (BUILD_AS_PLUGINS) target_link_libraries(uscxml ${USCXML_CORE_LIBS}) else() add_library(uscxml ${USCXML_FILES}) - message("USCXML_OPT_LIBS: ${USCXML_OPT_LIBS}") - message("USCXML_CORE_LIBS: ${USCXML_CORE_LIBS}") target_link_libraries(uscxml ${USCXML_OPT_LIBS} ${USCXML_CORE_LIBS}) endif() |