[framerate_producer] Renamed blend to blend2 and blend_all to blend3 to better descri...

[casparcg] / common / CMakeLists.txt

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 73c97002a62f3a025899a46df56637c3276c9f8a..9c5449fd451a23823958a353c6d7c83ab2d810d1 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -8,9 +8,12 @@ set(SOURCES
 
                base64.cpp
                env.cpp
+               except.cpp
+               filesystem.cpp
                log.cpp
                polling_filesystem_monitor.cpp
                stdafx.cpp
+               thread_info.cpp
                tweener.cpp
                utf.cpp
 )
@@ -20,11 +23,10 @@ if (MSVC)
                        compiler/vs/StackWalker.cpp
                        compiler/vs/StackWalker.h
 
-                       os/windows/current_version.h
                        os/windows/filesystem.cpp
                        os/windows/page_locked_allocator.cpp
                        os/windows/prec_timer.cpp
-                       os/windows/scheduling.cpp
+                       os/windows/threading.cpp
                        os/windows/stack_trace.cpp
                        os/windows/system_info.cpp
                        os/windows/win32_exception.cpp
@@ -36,7 +38,7 @@ elseif (CMAKE_COMPILER_IS_GNUCXX)
                        os/linux/filesystem.cpp
                        os/linux/prec_timer.cpp
                        os/linux/signal_handlers.cpp
-                       os/linux/scheduling.cpp
+                       os/linux/threading.cpp
                        os/linux/stack_trace.cpp
                        os/linux/system_info.cpp
        )
@@ -49,7 +51,7 @@ set(HEADERS
                os/filesystem.h
                os/general_protection_fault.h
                os/page_locked_allocator.h
-               os/scheduling.h
+               os/threading.h
                os/stack_trace.h
                os/system_info.h
 
@@ -64,6 +66,7 @@ set(HEADERS
                env.h
                except.h
                executor.h
+               filesystem.h
                filesystem_monitor.h
                forward.h
                future.h
@@ -72,14 +75,19 @@ set(HEADERS
                lock.h
                log.h
                memory.h
+               memcpy.h
+               memset.h
                memshfl.h
+               no_init_proxy.h
                param.h
                polling_filesystem_monitor.h
                prec_timer.h
-               reactive.h
+               ptree.h
                scope_exit.h
                semaphore.h
+               software_version.h
                stdafx.h
+               thread_info.h
                timer.h
                tweener.h
                utf.h
@@ -89,6 +97,7 @@ add_library(common ${SOURCES} ${HEADERS} ${OS_SPECIFIC_SOURCES})
 add_precompiled_header(common stdafx.h FORCEINCLUDE)
 
 include_directories(..)
+include_directories(${ASMLIB_INCLUDE_PATH})
 include_directories(${BOOST_INCLUDE_PATH})
 include_directories(${RXCPP_INCLUDE_PATH})
 include_directories(${TBB_INCLUDE_PATH})
@@ -154,10 +163,12 @@ if(MSVC)
        casparcg_add_runtime_dependency("${GLEW_BIN_PATH}/glew32.dll")
        casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbb.dll")
        casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbb_debug.dll")
-       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc.dll")
-       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_debug.dll")
-       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_proxy.dll")
-       casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_proxy_debug.dll")
+
+       # Reenable when tbb gets official support for vc14
+       # casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc.dll")
+       # casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_debug.dll")
+       # casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_proxy.dll")
+       # casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbbmalloc_proxy_debug.dll")
 else()
        casparcg_add_runtime_dependency("${GLEW_BIN_PATH}/libGLEW.so.1.12")
        casparcg_add_runtime_dependency("${TBB_BIN_PATH}/libtbb.so.2")