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 /contrib/cmake | |
| 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 'contrib/cmake')
| -rw-r--r-- | contrib/cmake/FindLIBICAL.cmake | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/contrib/cmake/FindLIBICAL.cmake b/contrib/cmake/FindLIBICAL.cmake index 652a4df..a0cfe43 100644 --- a/contrib/cmake/FindLIBICAL.cmake +++ b/contrib/cmake/FindLIBICAL.cmake @@ -10,23 +10,42 @@ FIND_PATH(LIBICAL_INCLUDE_DIR libical/ical.h ) FIND_LIBRARY(LIBICAL_LIBRARY_RELEASE - NAMES ical + NAMES ical libical libical-static ) if (LIBICAL_LIBRARY_RELEASE) - list(APPEND LIBICAL_LIBRARY optimized ${LIBICAL_LIBRARY_RELEASE}) + list(APPEND LIBICAL_LIBRARIES optimized ${LIBICAL_LIBRARY_RELEASE}) endif() FIND_LIBRARY(LIBICAL_LIBRARY_DEBUG - NAMES ical_d + NAMES ical_d libical_d libical-static_d ) if (LIBICAL_LIBRARY_DEBUG) - list(APPEND LIBICAL_LIBRARY debug ${LIBICAL_LIBRARY_DEBUG}) + list(APPEND LIBICAL_LIBRARIES debug ${LIBICAL_LIBRARY_DEBUG}) else() if (UNIX) - list(APPEND LIBICAL_LIBRARY debug ${LIBICAL_LIBRARY_RELEASE}) + list(APPEND LIBICAL_LIBRARIES debug ${LIBICAL_LIBRARY_RELEASE}) endif() endif() +FIND_LIBRARY(LIBICALSS_LIBRARY_RELEASE + NAMES icalss libicalss libicalss-static +) +if (LIBICALSS_LIBRARY_RELEASE) + list(APPEND LIBICAL_LIBRARIES optimized ${LIBICALSS_LIBRARY_RELEASE}) +endif() + +FIND_LIBRARY(LIBICALSS_LIBRARY_DEBUG + NAMES icalss_d libicalss_d libicalss-static_d +) +if (LIBICALSS_LIBRARY_DEBUG) + list(APPEND LIBICAL_LIBRARIES debug ${LIBICALSS_LIBRARY_DEBUG}) +else() + if (UNIX) + list(APPEND LIBICAL_LIBRARIES debug ${LIBICALSS_LIBRARY_RELEASE}) + endif() +endif() + + INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARY LIBICAL_INCLUDE_DIR) -MARK_AS_ADVANCED(LIBICAL_LIBRARY LIBICAL_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIR) +MARK_AS_ADVANCED(LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIR) |