diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-08-01 12:55:04 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-08-01 12:55:04 (GMT) |
| commit | 3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253 (patch) | |
| tree | 41f234c33e1e04015ef92a6b94212d9c7e97ad72 /CMakeLists.txt | |
| parent | 720bbe5c1b8c0789b5c7ad9ffca33e52bf77f1da (diff) | |
| download | uscxml-3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253.zip uscxml-3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253.tar.gz uscxml-3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253.tar.bz2 | |
Bug fixes and version bump
- New calendar invoker
- Fixed memory leaks with JavaScriptCore
- Compiles on windows again
- Beautified source code indentation
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ad02a49..685c010 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.4) # specify USCXML version SET(USCXML_VERSION_MAJOR "0") SET(USCXML_VERSION_MINOR "0") -SET(USCXML_VERSION_PATCH "5") +SET(USCXML_VERSION_PATCH "6") SET(USCXML_VERSION ${USCXML_VERSION_MAJOR}.${USCXML_VERSION_MINOR}.${USCXML_VERSION_PATCH}) # build type has to be set before the project definition4 @@ -397,6 +397,13 @@ if (NOT WIN32) set(XML_LIBRARIES ${LIBXML2_LIBRARIES}) list (APPEND USCXML_CORE_LIBS "dl") list (APPEND USCXML_CORE_LIBS "pthread") + if (APPLE) + find_library(CORELOCATION_LIBRARY CoreLocation) + if (CORELOCATION_LIBRARY AND OFF) + list (APPEND USCXML_OPT_LIBS ${CORELOCATION_LIBRARY}/CoreLocation) + set(CORELOCATION_FOUND ON) + endif() + endif() if (IOS) find_library(COREFOUNDATION_LIBRARY CoreFoundation) list (APPEND USCXML_CORE_LIBS ${COREFOUNDATION_LIBRARY}/CoreFoundation) @@ -505,10 +512,13 @@ if (FFMPEG_FOUND) include_directories (${FFMPEG_INCLUDE_DIR}) endif() +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(LIBICAL) if (LIBICAL_FOUND) - include_directories (${LIBICAL_INCLUDE_DIR}) + include_directories (${LIBICAL_INCLUDE_DIR}) + list (APPEND USCXML_OPT_LIBS ${LIBICAL_LIBRARIES}) endif() +set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STATIC}) if (WIN32) |