diff options
| author | Stefan Radomski <sradomski@mintwerk.de> | 2016-01-06 11:10:10 (GMT) |
|---|---|---|
| committer | Stefan Radomski <sradomski@mintwerk.de> | 2016-01-06 11:10:10 (GMT) |
| commit | f9eb54fc9c17116954846133b33f7a241e662cbc (patch) | |
| tree | 7b6eede00cd3c088f0f652acccc89d4471f9cfa6 /CMakeLists.txt | |
| parent | b8ba0e7c31f397a66f9d509ff20a85b33619475a (diff) | |
| download | uscxml-f9eb54fc9c17116954846133b33f7a241e662cbc.zip uscxml-f9eb54fc9c17116954846133b33f7a241e662cbc.tar.gz uscxml-f9eb54fc9c17116954846133b33f7a241e662cbc.tar.bz2 | |
Prepared ChartToC transformation
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8a6067..bee9942 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,6 +367,8 @@ else() OPTION(BUILD_TESTS_FSM_LUA "Create FSM converted W3C Lua tests" ON) OPTION(BUILD_TESTS_FSM_PROLOG "Create FSM converted W3C Prolog tests" ON) OPTION(BUILD_TESTS_FSM_PROMELA "Create FSM converted W3C Promela tests" ON) + OPTION(BUILD_TESTS_GENERATED_C "Create tests for generated C machines" ON) + endif() OPTION(ENABLE_GCOV "Compile with gcov support" OFF) @@ -746,14 +748,23 @@ if (APPLE OR IOS) OPTION(DISABLE_AUDIOTOOLBOX "Ignore AudioToolbox" OFF) if (NOT DISABLE_AUDIOTOOLBOX AND NOT DISABLE_ALL) find_library(AUDIOTOOLBOX AudioToolbox REQUIRED) - list (APPEND USCXML_OPT_LIBS ${AUDIOTOOLBOX}/AudioToolbox) + if (MACOSX_VERSION VERSION_GREATER "10.10.99") + # header files were moved it seems + list (APPEND USCXML_OPT_LIBS ${AUDIOTOOLBOX}) + else() + list (APPEND USCXML_OPT_LIBS ${AUDIOTOOLBOX}/AudioToolbox) + endif() set(AUDIOTOOLBOX_FOUND ON) else() set(AUDIOTOOLBOX_FOUND OFF) endif() find_library(FOUNDATION_LIBRARY Foundation) - list (APPEND USCXML_OPT_LIBS ${FOUNDATION_LIBRARY}/Foundation) - + if (MACOSX_VERSION VERSION_GREATER "10.10.99") + list (APPEND USCXML_OPT_LIBS ${FOUNDATION_LIBRARY}) + else() + list (APPEND USCXML_OPT_LIBS ${FOUNDATION_LIBRARY}/Foundation) + endif() + if (IOS) find_library(WTF_LIBRARY WTF) find_library(ICU_LIBRARY icucore REQUIRED) @@ -1009,7 +1020,11 @@ if (NOT DISABLE_OPENAL AND NOT DISABLE_ALL) if (OPENAL_FOUND) list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR}) if (APPLE OR IOS) - list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}/OpenAL) + if (MACOSX_VERSION VERSION_GREATER "10.10.99") + list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) + else() + list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}/OpenAL) + endif() else() list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) endif() |