diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-04 21:39:39 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-04 21:39:39 (GMT) |
| commit | 83ef70ebc7527240f56e2e601777a613bce6e47e (patch) | |
| tree | c520fec5b446672b69353a0b37460631840b4219 /CMakeLists.txt | |
| parent | 932916f952f302a46e41841ccf95ec1b7851b302 (diff) | |
| download | uscxml-83ef70ebc7527240f56e2e601777a613bce6e47e.zip uscxml-83ef70ebc7527240f56e2e601777a613bce6e47e.tar.gz uscxml-83ef70ebc7527240f56e2e601777a613bce6e47e.tar.bz2 | |
Beautified flattened state-machine ids
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 62bb177..4905554 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -806,17 +806,17 @@ if (NOT DISABLE_ICAL AND NOT DISABLE_ALL) endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) - if (NOT DEFINED ENV{LIBJINGLE_ROOT_DIR}) - set(ENV{LIBJINGLE_ROOT_DIR} "/Users/sradomski/Documents/TK/Code/webrtc-work/trunk") - endif() else() set(LIBICAL_FOUND OFF) endif() OPTION(DISABLE_WEBRTC "Ignore libjingle (WebRTC)" OFF) if (NOT DISABLE_WEBRTC AND NOT DISABLE_ALL) - find_package(LIBJINGLE) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) + if (NOT DEFINED ENV{LIBJINGLE_ROOT_DIR}) + set(ENV{LIBJINGLE_ROOT_DIR} "/Users/sradomski/Documents/TK/Code/webrtc-work/trunk") + endif() + find_package(LibJingle) if (LIBJINGLE_FOUND) include_directories (${LIBJINGLE_INCLUDE_DIRS}) list (APPEND USCXML_OPT_LIBS ${LIBJINGLE_LIBRARIES}) @@ -1097,6 +1097,8 @@ else() add_library(uscxml ${USCXML_FILES}) target_link_libraries(uscxml ${USCXML_OPT_LIBS} ${USCXML_CORE_LIBS}) endif() +INSTALL_LIBRARY(TARGETS uscxml COMPONENT library) + if (NOT CMAKE_CROSSCOMPILING) if (ENABLE_COTIRE) set_target_properties(uscxml PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "src/uscxml/pch.h") |