diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-09-18 15:39:30 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-09-18 15:39:30 (GMT) |
| commit | 8dde1311719b29c63efb379566916cb1aa9a7cd7 (patch) | |
| tree | 6849ab145936ea5a2bebee5b64e69c4d226c3810 /CMakeLists.txt | |
| parent | 7938e286967597c7168b855b7e3fdfbd9b949e0e (diff) | |
| download | uscxml-8dde1311719b29c63efb379566916cb1aa9a7cd7.zip uscxml-8dde1311719b29c63efb379566916cb1aa9a7cd7.tar.gz uscxml-8dde1311719b29c63efb379566916cb1aa9a7cd7.tar.bz2 | |
Work on FFMpegInvoker
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 96096ec..8a940d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,6 +187,7 @@ if (WIN32) include_directories(${PROJECT_SOURCE_DIR}/contrib/src/inttypes) endif() include_directories(${PROJECT_SOURCE_DIR}/contrib/src/jsmn) +#include_directories(${PROJECT_SOURCE_DIR}/contrib/src/google-url) ############################################################ # General setup @@ -352,6 +353,13 @@ else() add_definitions("-DUSCXML_STATIC") endif() +# file(GLOB +# GURL_SOURCE ${PROJECT_SOURCE_DIR}/contrib/src/google-url/googleurl/src/*.cc +# GURL_SOURCE ${PROJECT_SOURCE_DIR}/contrib/src/google-url/googleurl/src/*.h) +# list(APPEND USCXML_FILES ${GURL_SOURCE}) +# list(APPEND USCXML_FILES ${PROJECT_SOURCE_DIR}/contrib/src/google-url/base/string16.cc) + + # library suffix order if (IOS) LIST(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".dylib") @@ -447,6 +455,11 @@ elseif(WIN32) list (APPEND USCXML_CORE_LIBS ${XML_LIBRARIES}) endif() +# ICU +# find_package(ICU REQUIRED) +# include_directories(${ICU_INCLUDE_DIRS}) +# list (APPEND USCXML_CORE_LIBS ${ICU_LIBRARIES}) + # CURL find_package(CURL REQUIRED) include_directories(${CURL_INCLUDE_DIRS}) @@ -685,9 +698,13 @@ foreach( FILE ${USCXML_FILES} ) STRING(REGEX MATCH "[^\\/]*$" COMP_NAME ${PATH}) source_group("Element\\${COMP_NAME}" FILES ${FILE}) - elseif (${PATH} MATCHES ".*\\/ioprocessor\\/.*") - STRING(REGEX MATCH "[^\\/]*$" COMP_NAME ${PATH}) - source_group("IOProcessor\\${COMP_NAME}" FILES ${FILE}) + elseif (${PATH} MATCHES ".*\\/ioprocessor\\/.*") + STRING(REGEX MATCH "[^\\/]*$" COMP_NAME ${PATH}) + source_group("IOProcessor\\${COMP_NAME}" FILES ${FILE}) + + # elseif (${PATH} MATCHES ".*\\/google-url\\/.*") + # STRING(REGEX MATCH "[^\\/]*$" COMP_NAME ${PATH}) + # source_group("Interpreter\\URL" FILES ${FILE}) else () source_group(Interpreter FILES ${FILE}) |