diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-31 23:10:09 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-31 23:10:09 (GMT) |
| commit | 9caf9ade8ff87a1cb94fb612df4abd96fb5ed239 (patch) | |
| tree | a36ee9bb0de4c2e84824c7f28c9bcd1a19e85750 /CMakeLists.txt | |
| parent | 9254de87a25a4d91a30886ce361736fcfb642acb (diff) | |
| download | uscxml-9caf9ade8ff87a1cb94fb612df4abd96fb5ed239.zip uscxml-9caf9ade8ff87a1cb94fb612df4abd96fb5ed239.tar.gz uscxml-9caf9ade8ff87a1cb94fb612df4abd96fb5ed239.tar.bz2 | |
Create shared ffmpeg
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f407134..397c954 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -654,6 +654,7 @@ find_package(FFMPEG) 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_ORIG}) @@ -936,28 +937,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DI configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contrib/ctest/CTestCustom.ctest.in ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.ctest @ONCE) ############################################################ -# Include What You Use support -# https://code.google.com/p/chromium/wiki/IncludeWhatYouUse -############################################################ -# find_program(IWYU_BIN "iwyu" PATHS ENV PATH) -# if (IWYU_BIN) -# set(IWYU_ARGS "") -# get_property(IWYU_INCLUDES DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) -# list(REMOVE_DUPLICATES IWYU_INCLUDES) -# foreach(DIR ${IWYU_INCLUDES}) -# set(IWYU_ARGS "${IWYU_ARGS} -I${DIR}") -# endforeach() -# -# message(FATAL_ERROR ${IWYU_ARGS}) -# -# add_custom_target(iwyu ${IWYU_BIN} -# ${IWYU_ARGS} ${PROJECT_SOURCE_DIR}/src/uscxml/Factory.cpp -# COMMENT "Run include-what-you-use") -# add_dependencies(iwyu ${CMAKE_CURRENT_BINARY_DIR}/uscxml/config.h) -# # message(FATAL_ERROR "asdf") -#endif() - -############################################################ # Some concluding remarks ############################################################ |