diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-10 15:20:58 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-10 15:20:58 (GMT) |
| commit | 9484c653839ef3e8823358ac1e2963d97b056d98 (patch) | |
| tree | c591b82c7c97619f2ada5deb48ffdfb4904ecbd9 /CMakeLists.txt | |
| parent | a2c45baa7a14e8caa2a8f1c3937a03f4ba9fd8d4 (diff) | |
| download | uscxml-9484c653839ef3e8823358ac1e2963d97b056d98.zip uscxml-9484c653839ef3e8823358ac1e2963d97b056d98.tar.gz uscxml-9484c653839ef3e8823358ac1e2963d97b056d98.tar.bz2 | |
Get miles invoker operational again
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b1d5bcf..533106e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -653,15 +653,15 @@ endif() find_package(MILES) 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}) + # 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}) + # list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) @@ -756,12 +756,18 @@ else() endif() if (NOT CMAKE_CROSSCOMPILING) set_target_properties(uscxml PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "src/uscxml/pch.h") + set_target_properties(uscxml PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) cotire(uscxml) endif() if (NOT CMAKE_CROSSCOMPILING) add_executable(uscxml-browser apps/uscxml-browser.cpp) target_link_libraries(uscxml-browser uscxml) + if (NOT CMAKE_CROSSCOMPILING) + set_target_properties(uscxml-browser PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) + cotire(uscxml-browser) + endif() + set_target_properties(uscxml-browser PROPERTIES FOLDER "Apps") install_executable(TARGETS uscxml-browser COMPONENT tools) |