diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-29 22:47:34 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-29 22:47:34 (GMT) |
| commit | 0fb58c8183be355a386a2f61a2f69e20143c0be4 (patch) | |
| tree | 6bda6f0c136cb25bd0acbf77b428fb93cd5d569a /CMakeLists.txt | |
| parent | 5e53a9d596225970b1b3ff6107babcd974d46ab1 (diff) | |
| download | uscxml-0fb58c8183be355a386a2f61a2f69e20143c0be4.zip uscxml-0fb58c8183be355a386a2f61a2f69e20143c0be4.tar.gz uscxml-0fb58c8183be355a386a2f61a2f69e20143c0be4.tar.bz2 | |
Deactivated OpenAL on windows for now
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f57582b..f407134 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,6 +445,7 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES_STATIC .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) if(BUILD_PREFER_STATIC_LIBRARIES) SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) endif() +SET(CMAKE_FIND_LIBRARY_SUFFIXES_ORIG ${CMAKE_FIND_LIBRARY_SUFFIXES}) # where should libraries end up? if (DIST_PREPARE) @@ -642,7 +643,7 @@ if (SWI_FOUND) list (APPEND USCXML_OPT_LIBS ${SWI_LIBRARY}) endif() endif() -set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) find_package(Sqlite3) if (SQLITE3_FOUND) @@ -654,7 +655,7 @@ if (FFMPEG_FOUND) include_directories (${FFMPEG_INCLUDE_DIR}) list (APPEND USCXML_OPT_LIBS ${FFMPEG_LIBRARIES}) endif() -set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(LIBICAL) @@ -662,7 +663,7 @@ if (LIBICAL_FOUND) include_directories (${LIBICAL_INCLUDE_DIR}) list (APPEND USCXML_OPT_LIBS ${LIBICAL_LIBRARIES}) endif() -set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(LibPurple) @@ -680,7 +681,7 @@ if (LIBPURPLE_FOUND) set(LIBPURPLE_FOUND OFF) endif() endif() -set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) if (WIN32) @@ -708,27 +709,27 @@ if (OPENSCENEGRAPH_FOUND AND OPENGL_FOUND) include_directories (${OPENGL_INCLUDE_DIR}) list (APPEND USCXML_OPT_LIBS ${OPENSCENEGRAPH_LIBRARIES} ${OPENGL_LIBRARIES}) endif() -if (UNIX) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) -endif() +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) set(CMAKE_FIND_FRAMEWORK "FIRST") -find_package(OpenAL) -if (OPENAL_FOUND) - list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR}) - if (APPLE OR IOS) - list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}/OpenAL) - else() - list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) - endif() -else() - find_package(OpenALKCAT) +if (NOT WIN32) + find_package(OpenAL) if (OPENAL_FOUND) list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR}) - list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) + if (APPLE OR IOS) + list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}/OpenAL) + else() + list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) + endif() + else() + find_package(OpenALKCAT) + if (OPENAL_FOUND) + list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR}) + list (APPEND USCXML_OPT_LIBS ${OPENAL_LIBRARY}) + endif() endif() + set(CMAKE_FIND_FRAMEWORK "LAST") endif() -set(CMAKE_FIND_FRAMEWORK "LAST") if (NOT AUDIOTOOLBOX_FOUND) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) @@ -737,18 +738,15 @@ if (NOT AUDIOTOOLBOX_FOUND) list (APPEND USCXML_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) list (APPEND USCXML_OPT_LIBS ${LIBSNDFILE_LIBRARY}) endif() - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) endif() -if (WIN32) - find_package(MILES) -else() - find_package(MILES COMPONENTS audio video core network session utils debug image) -endif() +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) +find_package(MILES) #set(JPEG_ROOT_PATH "" CACHE STRING "Where to find libjpeg") if (MILES_FOUND) - if (NOT WIN32) + if (OFF) # openal is only needed for miles find_package(OpenAL) find_package(JPEG) @@ -771,6 +769,7 @@ if (MILES_FOUND) list (APPEND USCXML_OPT_LIBS ${MILES_LIBRARIES}) endif() endif() +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(Protobuf) @@ -779,7 +778,7 @@ if (PROTOBUF_FOUND) LIST(APPEND USCXML_OPT_LIBS optimized ${PROTOBUF_LIBRARY}) LIST(APPEND USCXML_OPT_LIBS debug ${PROTOBUF_LIBRARY_DEBUG}) endif() -set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) ################################################# # Gather source files |