[video_channel] Reverted behavior which effectively caused an increased pipeline...

[casparcg] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb6d853ccb2ea500c230bb133258c7abf6600d5d..e4276b470034b6f35d3ee466f67d8c76977e11d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,26 +32,38 @@ set(ASMLIB_INCLUDE_PATH                     "${DEPENDENCIES_FOLDER}/asmlib")
 set(FREEIMAGE_INCLUDE_PATH             "${DEPENDENCIES_FOLDER}/freeimage/include")
 set(OPENAL_INCLUDE_PATH                        "${DEPENDENCIES_FOLDER}/openal/include")
 set(BLUEFISH_INCLUDE_PATH              "${DEPENDENCIES_FOLDER}/bluefish/include")
+set(CEF_INCLUDE_PATH                   "${DEPENDENCIES_FOLDER}/cef/include")
+set(GTEST_INCLUDE_PATH                 "${DEPENDENCIES_FOLDER}/gtest/include")
 
-set(FFMPEG_BIN_PATH                            "${DEPENDENCIES_FOLDER}/ffmpeg/bin")
-set(FREEIMAGE_BIN_PATH                 "${DEPENDENCIES_FOLDER}/freeimage/bin")
-set(GLEW_BIN_PATH                              "${DEPENDENCIES_FOLDER}/glew/bin")
-set(OPENAL_BIN_PATH                            "${DEPENDENCIES_FOLDER}/openal/bin")
-set(TBB_BIN_PATH                               "${DEPENDENCIES_FOLDER}/tbb/bin")
+if (MSVC)
+       set(PLATFORM_FOLDER_NAME        "win32")
+elseif (CMAKE_COMPILER_IS_GNUCXX)
+       set(PLATFORM_FOLDER_NAME        "linux")
+endif ()
+
+set(FFMPEG_BIN_PATH                            "${DEPENDENCIES_FOLDER}/ffmpeg/bin/${PLATFORM_FOLDER_NAME}")
+set(FREEIMAGE_BIN_PATH                 "${DEPENDENCIES_FOLDER}/freeimage/bin/${PLATFORM_FOLDER_NAME}")
+set(GLEW_BIN_PATH                              "${DEPENDENCIES_FOLDER}/glew/bin/${PLATFORM_FOLDER_NAME}")
+set(OPENAL_BIN_PATH                            "${DEPENDENCIES_FOLDER}/openal/bin/${PLATFORM_FOLDER_NAME}")
+set(TBB_BIN_PATH                               "${DEPENDENCIES_FOLDER}/tbb/bin/${PLATFORM_FOLDER_NAME}")
 set(LIBERATION_FONTS_BIN_PATH  "${DEPENDENCIES_FOLDER}/liberation-fonts")
+set(CEF_PATH                                   "${DEPENDENCIES_FOLDER}/cef")
+set(CEF_BIN_PATH                               "${DEPENDENCIES_FOLDER}/cef/bin/${PLATFORM_FOLDER_NAME}")
 
-link_directories("${DEPENDENCIES_FOLDER}/boost/stage/lib")
-link_directories("${DEPENDENCIES_FOLDER}/tbb/lib")
-link_directories("${DEPENDENCIES_FOLDER}/glew/lib")
-link_directories("${DEPENDENCIES_FOLDER}/sfml/lib")
+link_directories("${DEPENDENCIES_FOLDER}/boost/stage/lib/${PLATFORM_FOLDER_NAME}")
+link_directories("${DEPENDENCIES_FOLDER}/tbb/lib/${PLATFORM_FOLDER_NAME}")
+link_directories("${DEPENDENCIES_FOLDER}/glew/lib/${PLATFORM_FOLDER_NAME}")
+link_directories("${DEPENDENCIES_FOLDER}/sfml/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/sfml/extlibs/lib")
 link_directories("${DEPENDENCIES_FOLDER}/freetype/objs/win32/vc2010")
-link_directories("${DEPENDENCIES_FOLDER}/ffmpeg/lib")
+link_directories("${DEPENDENCIES_FOLDER}/ffmpeg/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/asmlib")
-link_directories("${DEPENDENCIES_FOLDER}/freeimage/lib")
-link_directories("${DEPENDENCIES_FOLDER}/openal/lib")
+link_directories("${DEPENDENCIES_FOLDER}/freeimage/lib/${PLATFORM_FOLDER_NAME}")
+link_directories("${DEPENDENCIES_FOLDER}/openal/lib/${PLATFORM_FOLDER_NAME}")
 link_directories("${DEPENDENCIES_FOLDER}/bluefish/lib")
 link_directories("${DEPENDENCIES_FOLDER}/zlib/lib")
+link_directories("${DEPENDENCIES_FOLDER}/cef/lib/${PLATFORM_FOLDER_NAME}")
+link_directories("${DEPENDENCIES_FOLDER}/gtest/lib/${PLATFORM_FOLDER_NAME}")
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -60,26 +72,39 @@ add_definitions( -DBOOST_THREAD_VERSION=4 )
 add_definitions( -DTBB_USE_CAPTURED_EXCEPTION=0 )
 add_definitions( -DUNICODE )
 add_definitions( -D_UNICODE )
+add_definitions( -DGLEW_NO_GLU )
+add_definitions( "-DBOOST_ASIO_ERROR_CATEGORY_NOEXCEPT=noexcept(true)" ) # Workaround macro redefinition in boost
+add_definitions( -D_GLIBCXX_USE_CXX11_ABI=0 ) # Allow compilation in GCC 5 while keeping old dependencies
 
 if (MSVC)
-       set(CMAKE_CXX_FLAGS                     "${CMAKE_CXX_FLAGS}                     /EHa /Zi /W4 /WX /MP /fp:fast /FIcommon/compiler/vs/disable_silly_warnings.h")
-       set(CMAKE_CXX_FLAGS_DEBUG       "${CMAKE_CXX_FLAGS_DEBUG}       /D TBB_USE_ASSERT=1 /D TBB_USE_DEBUG /bigobj")
-       set(CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE}     /Oi /Ot /Gy")
-
+       set(CMAKE_CXX_FLAGS                                     "${CMAKE_CXX_FLAGS}                                     /EHa /Zi /W4 /WX /MP /fp:fast /Zm192 /FIcommon/compiler/vs/disable_silly_warnings.h")
+       set(CMAKE_CXX_FLAGS_DEBUG                       "${CMAKE_CXX_FLAGS_DEBUG}                       /D TBB_USE_ASSERT=1 /D TBB_USE_DEBUG /bigobj")
+       set(CMAKE_CXX_FLAGS_RELEASE                     "${CMAKE_CXX_FLAGS_RELEASE}                     /Oi /Ot /Gy /bigobj")
+       set(CMAKE_CXX_FLAGS_RELWITHDEBINFO      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}      /Oi /Ot /Gy /bigobj /Ob2")
 elseif (CMAKE_COMPILER_IS_GNUCXX)
+       set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g")
        add_compile_options( -std=c++11 )
        add_compile_options( -msse3 )
        add_compile_options( -mssse3 )
        add_compile_options( -msse4.1 )
+       add_compile_options( -pthread )
+       add_compile_options( -fPIC )
+       add_compile_options( -fnon-call-exceptions ) # Allow signal handler to throw exception
+       add_definitions( -DBOOST_NO_SWPRINTF ) # swprintf on Linux seems to always use , as decimal point regardless of C-locale or C++-locale
+endif ()
+
+if (POLICY CMP0045)
+       cmake_policy(SET CMP0045 OLD)
 endif ()
 
-cmake_policy(SET CMP0045 OLD)
 include(CMake/PrecompiledHeader.cmake)
 
-set(CASPARCG_MODULE_INCLUDE_STATEMENTS "" CACHE INTERNAL "")
-set(CASPARCG_MODULE_INIT_STATEMENTS            "" CACHE INTERNAL "")
-set(CASPARCG_MODULE_UNINIT_STATEMENTS  "" CACHE INTERNAL "")
-set(CASPARCG_MODULE_PROJECTS                   "" CACHE INTERNAL "")
+set(CASPARCG_MODULE_INCLUDE_STATEMENTS                                                 "" CACHE INTERNAL "")
+set(CASPARCG_MODULE_INIT_STATEMENTS                                                            "" CACHE INTERNAL "")
+set(CASPARCG_MODULE_UNINIT_STATEMENTS                                                  "" CACHE INTERNAL "")
+set(CASPARCG_MODULE_COMMAND_LINE_ARG_INTERCEPTORS_STATEMENTS   "" CACHE INTERNAL "")
+set(CASPARCG_MODULE_PROJECTS                                                                   "" CACHE INTERNAL "")
+set(CASPARCG_RUNTIME_DEPENDENCIES                                                              "" CACHE INTERNAL "")
 
 function(casparcg_add_include_statement HEADER_FILE_TO_INCLUDE)
        set(CASPARCG_MODULE_INCLUDE_STATEMENTS "${CASPARCG_MODULE_INCLUDE_STATEMENTS}"
@@ -96,8 +121,17 @@ function(casparcg_add_init_statement INIT_FUNCTION_NAME NAME_TO_LOG)
 endfunction()
 
 function(casparcg_add_uninit_statement UNINIT_FUNCTION_NAME)
-       set(CASPARCG_MODULE_UNINIT_STATEMENTS "${CASPARCG_MODULE_UNINIT_STATEMENTS}"
+       set(CASPARCG_MODULE_UNINIT_STATEMENTS
                        "       ${UNINIT_FUNCTION_NAME}()\;"
+                       "${CASPARCG_MODULE_UNINIT_STATEMENTS}"
+                       CACHE INTERNAL "")
+endfunction()
+
+function(casparcg_add_command_line_arg_interceptor INTERCEPTOR_FUNCTION_NAME)
+       set(CASPARCG_MODULE_COMMAND_LINE_ARG_INTERCEPTORS_STATEMENTS "${CASPARCG_MODULE_COMMAND_LINE_ARG_INTERCEPTORS_STATEMENTS}"
+                       "       if (${INTERCEPTOR_FUNCTION_NAME}(argc, argv))"
+                       "               return true\;"
+                       ""
                        CACHE INTERNAL "")
 endfunction()
 
@@ -112,6 +146,10 @@ function(join_list VALUES GLUE OUTPUT)
        set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
 endfunction()
 
+function(casparcg_add_runtime_dependency FILE_TO_COPY)
+       set(CASPARCG_RUNTIME_DEPENDENCIES "${CASPARCG_RUNTIME_DEPENDENCIES}" "${FILE_TO_COPY}" CACHE INTERNAL "")
+endfunction()
+
 add_subdirectory(accelerator)
 add_subdirectory(common)
 add_subdirectory(core)
@@ -119,3 +157,4 @@ add_subdirectory(modules)
 
 add_subdirectory(protocol)
 add_subdirectory(shell)
+add_subdirectory(unit-test)