Skip to content

Commit

Permalink
feat: replace nuget and embedded windows dependencies with direct htt…
Browse files Browse the repository at this point in the history
…p downloads

This uses cmake ExternalProject_Add to download at build time, using a copy of libraries mirrored in a github repository to ensure availability.
  • Loading branch information
Julusian committed Oct 31, 2023
1 parent 0d8af51 commit 402af68
Show file tree
Hide file tree
Showing 207 changed files with 175 additions and 64,326 deletions.
4 changes: 4 additions & 0 deletions src/CMakeModules/Bootstrap_Linux.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ FUNCTION (add_precompiled_header TARGET HEADER)
# Ignore
ENDFUNCTION ()

FUNCTION (casparcg_add_build_dependency PROJECT LIB)
# Ignore
ENDFUNCTION ()

FUNCTION (casparcg_add_include_statement HEADER_FILE_TO_INCLUDE)
SET (CASPARCG_MODULE_INCLUDE_STATEMENTS "${CASPARCG_MODULE_INCLUDE_STATEMENTS}"
"#include <${HEADER_FILE_TO_INCLUDE}>"
Expand Down
205 changes: 151 additions & 54 deletions src/CMakeModules/Bootstrap_Windows.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
cmake_minimum_required (VERSION 3.16)

include(ExternalProject)

INCLUDE (PlatformIntrospection)
_DETERMINE_CPU_COUNT (CONFIG_CPU_COUNT)

find_package(Git)

set(CONFIG_VERSION_GIT_HASH "N/A")
Expand All @@ -13,6 +18,10 @@ endif ()
CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/version.tmpl" "${CMAKE_BINARY_DIR}/generated/version.h")
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/generated")

set(CASPARCG_DOWNLOAD_MIRROR https://github.com/CasparCG/dependencies/releases/download/ CACHE STRING "Source/mirror to use for external dependencies")
set(CASPARCG_DOWNLOAD_CACHE ${CMAKE_CURRENT_BINARY_DIR}/external CACHE STRING "Download cache directory for cmake ExternalProjects")
set(BOOST_USE_PRECOMPILED ON CACHE BOOL "Use precompiled boost")

set(CASPARCG_MODULE_INCLUDE_STATEMENTS "" CACHE INTERNAL "")
set(CASPARCG_MODULE_INIT_STATEMENTS "" CACHE INTERNAL "")
set(CASPARCG_MODULE_UNINIT_STATEMENTS "" CACHE INTERNAL "")
Expand All @@ -21,6 +30,10 @@ set(CASPARCG_MODULE_PROJECTS "" CACHE INTERNAL "")
set(CASPARCG_RUNTIME_DEPENDENCIES "" CACHE INTERNAL "")
set(CASPARCG_RUNTIME_DEPENDENCIES_DIRS "" CACHE INTERNAL "")

function(casparcg_add_build_dependency PROJECT)
add_dependencies(${PROJECT} ${ARGN})
endfunction()

function(casparcg_add_include_statement HEADER_FILE_TO_INCLUDE)
set(CASPARCG_MODULE_INCLUDE_STATEMENTS "${CASPARCG_MODULE_INCLUDE_STATEMENTS}"
"#include <${HEADER_FILE_TO_INCLUDE}>"
Expand Down Expand Up @@ -68,33 +81,59 @@ function(casparcg_add_runtime_dependency_dir FILE_TO_COPY)
set(CASPARCG_RUNTIME_DEPENDENCIES_DIRS "${CASPARCG_RUNTIME_DEPENDENCIES_DIRS}" "${FILE_TO_COPY}" CACHE INTERNAL "")
endfunction()

set(PACKAGES_FOLDER "${PROJECT_SOURCE_DIR}/packages")
set(NUGET_PACKAGES_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/packages")

casparcg_add_runtime_dependency("${PROJECT_SOURCE_DIR}/shell/casparcg.config")

# BOOST
set(BOOST_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/boost.1.67.0.0/lib/native/include")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_atomic-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_chrono-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_context-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_coroutine-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_date_time-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_filesystem-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_locale-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_log-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_log_setup-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_regex-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_system-vc141.1.67.0.0/lib/native")
link_directories("${NUGET_PACKAGES_FOLDER}/boost_thread-vc141.1.67.0.0/lib/native")
if (BOOST_USE_PRECOMPILED)
ExternalProject_Add(boost
URL ${CASPARCG_DOWNLOAD_MIRROR}/boost/boost_1_67_0-precompiled.zip
URL_HASH MD5=8fd5450206d48acc51dff83ce5a34a20
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(boost SOURCE_DIR)
set(BOOST_INCLUDE_PATH "${SOURCE_DIR}/include/boost-1_67")
link_directories("${SOURCE_DIR}/lib")
else ()
set(BOOST_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install)
ExternalProject_Add(boost
URL ${CASPARCG_DOWNLOAD_MIRROR}/boost/boost_1_67_0.zip
URL_HASH MD5=6da1ba65f8d33b1d306616e5acd87f67
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./bootstrap.bat
--with-libraries=filesystem
--with-libraries=locale
--with-libraries=log
--with-libraries=log_setup
--with-libraries=regex
--with-libraries=system
--with-libraries=thread
BUILD_COMMAND ./b2 install --prefix=${BOOST_INSTALL_DIR} link=static variant=release threading=multi runtime-link=shared -j ${CONFIG_CPU_COUNT}
INSTALL_COMMAND ""
)
set(BOOST_INCLUDE_PATH "${BOOST_INSTALL_DIR}/include/boost-1_67")
link_directories("${BOOST_INSTALL_DIR}/lib")
endif ()
add_definitions( -DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE )
add_definitions( -DBOOST_COROUTINES_NO_DEPRECATION_WARNING )
add_definitions( -DBOOST_LOCALE_HIDE_AUTO_PTR )

# FFMPEG
set(FFMPEG_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/FFmpeg.Stable.5.1.2/build/native/include")
set(FFMPEG_BIN_PATH "${NUGET_PACKAGES_FOLDER}/FFmpeg.Stable.5.1.2/build/native/bin/x64")
link_directories("${NUGET_PACKAGES_FOLDER}/FFmpeg.Stable.5.1.2/build/native/lib/x64")
ExternalProject_Add(ffmpeg-lib
URL ${CASPARCG_DOWNLOAD_MIRROR}/ffmpeg/ffmpeg-5.1.2-full_build-shared.zip
URL_HASH MD5=bcb1efb68701a4b71e8a7efd9b817965
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(ffmpeg-lib SOURCE_DIR)
set(FFMPEG_INCLUDE_PATH "${SOURCE_DIR}/include")
set(FFMPEG_BIN_PATH "${SOURCE_DIR}/bin")
link_directories("${SOURCE_DIR}/lib")
casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avcodec-59.dll")
casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avdevice-59.dll")
casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avfilter-8.dll")
Expand All @@ -108,62 +147,120 @@ casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/ffmpeg.exe")
casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/ffprobe.exe")

# TBB
set(TBB_INCLUDE_PATH "${PACKAGES_FOLDER}/tbb/include")
set(TBB_BIN_PATH "${PACKAGES_FOLDER}/tbb/bin/intel64")
link_directories("${PACKAGES_FOLDER}/tbb/lib/intel64")
ExternalProject_Add(tbb
URL ${CASPARCG_DOWNLOAD_MIRROR}/tbb/oneapi-tbb-2021.1.1-win.zip
URL_HASH MD5=51bf49044d477dea67670abd92f8814c
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(tbb SOURCE_DIR)
set(TBB_INCLUDE_PATH "${SOURCE_DIR}/include")
set(TBB_BIN_PATH "${SOURCE_DIR}/redist/intel64/vc14")
link_directories("${SOURCE_DIR}/lib/intel64/vc14")
casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbb12.dll")
casparcg_add_runtime_dependency("${TBB_BIN_PATH}/tbb12_debug.dll")

# GLEW
set(GLEW_INCLUDE_PATH "${PACKAGES_FOLDER}/glew/include")
set(GLEW_BIN_PATH "${PACKAGES_FOLDER}/glew/bin/win32")
link_directories("${PACKAGES_FOLDER}/glew/lib/win32")
ExternalProject_Add(glew
URL ${CASPARCG_DOWNLOAD_MIRROR}/glew/glew-2.2.0-win32.zip
URL_HASH MD5=1feddfe8696c192fa46a0df8eac7d4bf
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(glew SOURCE_DIR)
set(GLEW_INCLUDE_PATH ${SOURCE_DIR}/include)
set(GLEW_BIN_PATH ${SOURCE_DIR}/bin/Release/x64)
link_directories(${SOURCE_DIR}/lib/Release/x64)
add_definitions( -DGLEW_NO_GLU )
casparcg_add_runtime_dependency("${GLEW_BIN_PATH}/glew32.dll")

# SFML
set(SFML_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/sfml-system.2.4.2.0/build/native/include")
link_directories("${NUGET_PACKAGES_FOLDER}/sfml-graphics.2.4.2.0/build/native/lib/x64/v140/Debug/dynamic")
link_directories("${NUGET_PACKAGES_FOLDER}/sfml-graphics.2.4.2.0/build/native/lib/x64/v140/Release/dynamic")
link_directories("${NUGET_PACKAGES_FOLDER}/sfml-window.2.4.2.0/build/native/lib/x64/v140/Debug/dynamic")
link_directories("${NUGET_PACKAGES_FOLDER}/sfml-window.2.4.2.0/build/native/lib/x64/v140/Release/dynamic")
link_directories("${NUGET_PACKAGES_FOLDER}/sfml-system.2.4.2.0/build/native/lib/x64/v140/Debug/dynamic")
link_directories("${NUGET_PACKAGES_FOLDER}/sfml-system.2.4.2.0/build/native/lib/x64/v140/Release/dynamic")
casparcg_add_runtime_dependency("${NUGET_PACKAGES_FOLDER}/sfml-graphics.redist.2.4.2.0/build/native/bin/x64/v140/Debug/dynamic/sfml-graphics-d-2.dll")
casparcg_add_runtime_dependency("${NUGET_PACKAGES_FOLDER}/sfml-graphics.redist.2.4.2.0/build/native/bin/x64/v140/Release/dynamic/sfml-graphics-2.dll")
casparcg_add_runtime_dependency("${NUGET_PACKAGES_FOLDER}/sfml-window.redist.2.4.2.0/build/native/bin/x64/v140/Debug/dynamic/sfml-window-d-2.dll")
casparcg_add_runtime_dependency("${NUGET_PACKAGES_FOLDER}/sfml-window.redist.2.4.2.0/build/native/bin/x64/v140/Release/dynamic/sfml-window-2.dll")
casparcg_add_runtime_dependency("${NUGET_PACKAGES_FOLDER}/sfml-system.redist.2.4.2.0/build/native/bin/x64/v140/Debug/dynamic/sfml-system-d-2.dll")
casparcg_add_runtime_dependency("${NUGET_PACKAGES_FOLDER}/sfml-system.redist.2.4.2.0/build/native/bin/x64/v140/Release/dynamic/sfml-system-2.dll")
ExternalProject_Add(sfml
URL ${CASPARCG_DOWNLOAD_MIRROR}/sfml/SFML-2.4.2-windows-vc14-64-bit.zip
URL_HASH MD5=8a2f747335fa21a7a232976daa9031ac
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(sfml SOURCE_DIR)
set(SFML_INCLUDE_PATH ${SOURCE_DIR}/include)
set(SFML_BIN_PATH "${SOURCE_DIR}/bin")
link_directories(${SOURCE_DIR}/lib)
casparcg_add_runtime_dependency("${SFML_BIN_PATH}/sfml-graphics-d-2.dll")
casparcg_add_runtime_dependency("${SFML_BIN_PATH}/sfml-graphics-2.dll")
casparcg_add_runtime_dependency("${SFML_BIN_PATH}/sfml-window-d-2.dll")
casparcg_add_runtime_dependency("${SFML_BIN_PATH}/sfml-window-2.dll")
casparcg_add_runtime_dependency("${SFML_BIN_PATH}/sfml-system-d-2.dll")
casparcg_add_runtime_dependency("${SFML_BIN_PATH}/sfml-system-2.dll")

# FREEIMAGE
set(FREEIMAGE_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/native.freeimage.vc140.3.17.0/build/native/include")
set(FREEIMAGE_BIN_PATH "${NUGET_PACKAGES_FOLDER}/native.freeimage.vc140.redist.3.17.0/build/native/bin/x64/dynamic")
link_directories("${NUGET_PACKAGES_FOLDER}/native.freeimage.vc140.3.17.0/build/native/lib/x64")
casparcg_add_runtime_dependency("${FREEIMAGE_BIN_PATH}/FreeImage.dll")
casparcg_add_runtime_dependency("${FREEIMAGE_BIN_PATH}/FreeImaged.dll")
ExternalProject_Add(freeimage
URL ${CASPARCG_DOWNLOAD_MIRROR}/freeimage/FreeImage3180Win32Win64.zip
URL_HASH MD5=393d3df75b14cbcb4887da1c395596e2
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(freeimage SOURCE_DIR)
set(FREEIMAGE_INCLUDE_PATH "${SOURCE_DIR}/Dist/x64")
set(FREEIMAGE_BIN_PATH "${FREEIMAGE_INCLUDE_PATH}")
link_directories("${FREEIMAGE_INCLUDE_PATH}")
casparcg_add_runtime_dependency("${FREEIMAGE_INCLUDE_PATH}/FreeImage.dll")

#ZLIB
set(ZLIB_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/zlib-msvc-x64.1.2.11.8900/build/native/include")
link_directories("${NUGET_PACKAGES_FOLDER}/zlib-msvc-x64.1.2.11.8900/build/native/lib_release")
link_directories("${NUGET_PACKAGES_FOLDER}/zlib-msvc-x64.1.2.11.8900/build/native/lib_debug")
ExternalProject_Add(zlib
URL ${CASPARCG_DOWNLOAD_MIRROR}/zlib/zlib-1.3.tar.gz
URL_HASH MD5=60373b133d630f74f4a1f94c1185a53f
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(zlib SOURCE_DIR)
ExternalProject_Get_Property(zlib BINARY_DIR)
set(ZLIB_INCLUDE_PATH "${SOURCE_DIR};${BINARY_DIR}")
link_directories(${BINARY_DIR}/Release)

# OPENAL
set(OPENAL_INCLUDE_PATH "${PACKAGES_FOLDER}/openal/include")
set(OPENAL_BIN_PATH "${PACKAGES_FOLDER}/openal/bin/win32")
link_directories("${PACKAGES_FOLDER}/openal/lib/win32")
casparcg_add_runtime_dependency("${OPENAL_BIN_PATH}/OpenAL32.dll")
ExternalProject_Add(openal
URL ${CASPARCG_DOWNLOAD_MIRROR}/openal/openal-soft-1.19.1-bin.zip
URL_HASH MD5=b78ef1ba26f7108e763f92df6bbc3fa5
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ""
BUILD_COMMAND cp bin/Win64/soft_oal.dll bin/Win64/OpenAL32.dll
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(openal SOURCE_DIR)
set(OPENAL_INCLUDE_PATH "${SOURCE_DIR}/include")
link_directories("${SOURCE_DIR}/libs/Win64")
casparcg_add_runtime_dependency("${SOURCE_DIR}/bin/Win64/OpenAL32.dll")

# LIBERATION_FONTS
set(LIBERATION_FONTS_BIN_PATH "${PROJECT_SOURCE_DIR}/shell/liberation-fonts")
casparcg_add_runtime_dependency("${LIBERATION_FONTS_BIN_PATH}/LiberationMono-Regular.ttf")

# CEF
if (ENABLE_HTML)
set(CEF_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/casparcg.cef.sdk.95.0.1-MediaHandler.2467/CEF")
set(CEF_BIN_PATH "${NUGET_PACKAGES_FOLDER}/casparcg.cef.redist.x64.95.0.1-MediaHandler.2467/CEF")
set(CEF_RESOURCE_PATH "${NUGET_PACKAGES_FOLDER}/casparcg.cef.redist.x64.95.0.1-MediaHandler.2467/CEF")
link_directories("${NUGET_PACKAGES_FOLDER}/casparcg.cef.sdk.95.0.1-MediaHandler.2467/CEF/x64")
ExternalProject_Add(cef
URL ${CASPARCG_DOWNLOAD_MIRROR}/cef/cef_binary_4638_windows_x64.zip
URL_HASH MD5=14ad547122903eba3f145322fb02bc6d
DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
CMAKE_ARGS -DUSE_SANDBOX=Off -DCEF_RUNTIME_LIBRARY_FLAG=/MD
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(cef SOURCE_DIR)
ExternalProject_Get_Property(cef BINARY_DIR)

set(CEF_INCLUDE_PATH ${SOURCE_DIR})
set(CEF_BIN_PATH ${SOURCE_DIR}/Release)
set(CEF_RESOURCE_PATH ${SOURCE_DIR}/Resources)
link_directories(${SOURCE_DIR}/Release)
link_directories(${BINARY_DIR}/libcef_dll_wrapper/Release)

casparcg_add_runtime_dependency_dir("${CEF_RESOURCE_PATH}/locales")
casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/chrome_100_percent.pak")
Expand Down
3 changes: 1 addition & 2 deletions src/accelerator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ target_include_directories(accelerator PRIVATE
${BOOST_INCLUDE_PATH}
${TBB_INCLUDE_PATH}
${GLEW_INCLUDE_PATH}
${FFMPEG_INCLUDE_PATH}
${SFML_INCLUDE_PATH}
)
target_precompile_headers(accelerator PRIVATE "StdAfx.h")

casparcg_add_build_dependency(accelerator boost tbb glew sfml)

source_group(sources ./.*)
source_group(sources\\cpu\\image cpu/image/.*)
Expand Down
8 changes: 0 additions & 8 deletions src/accelerator/packages.config

This file was deleted.

3 changes: 1 addition & 2 deletions src/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ target_include_directories(common PRIVATE
${GLEW_INCLUDE_PATH}
)
target_precompile_headers(common PRIVATE "stdafx.h")

configure_file("${PROJECT_SOURCE_DIR}/packages.config" "${CMAKE_CURRENT_BINARY_DIR}/packages.config")
casparcg_add_build_dependency(common boost tbb glew)

source_group(sources ./*)
source_group(sources\\gl gl/*)
Expand Down
2 changes: 1 addition & 1 deletion src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ target_include_directories(core PRIVATE
${GLEW_INCLUDE_PATH}
)
target_precompile_headers(core PRIVATE "StdAfx.h")
configure_file("${PROJECT_SOURCE_DIR}/packages.config" "${CMAKE_CURRENT_BINARY_DIR}/packages.config")
casparcg_add_build_dependency(core boost tbb glew sfml)

source_group(sources ./*)
source_group(sources\\consumer consumer/*)
Expand Down
10 changes: 0 additions & 10 deletions src/core/packages.config

This file was deleted.

2 changes: 1 addition & 1 deletion src/modules/artnet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target_include_directories(artnet PRIVATE
${BOOST_INCLUDE_PATH}
${TBB_INCLUDE_PATH}
)
configure_file("${PROJECT_SOURCE_DIR}/packages.config" "${CMAKE_CURRENT_BINARY_DIR}/packages.config")
casparcg_add_build_dependency(artnet boost tbb)

set_target_properties(artnet PROPERTIES FOLDER modules)
source_group(sources\\consumer consumer/*)
Expand Down
2 changes: 1 addition & 1 deletion src/modules/bluefish/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ target_include_directories(bluefish PRIVATE
${FFMPEG_INCLUDE_PATH}
)
target_precompile_headers(bluefish PRIVATE "StdAfx.h")
configure_file("${PROJECT_SOURCE_DIR}/packages.config" "${CMAKE_CURRENT_BINARY_DIR}/packages.config")
casparcg_add_build_dependency(bluefish boost tbb ffmpeg-lib)

set_target_properties(bluefish PROPERTIES FOLDER modules)
source_group(sources ./*)
Expand Down
5 changes: 0 additions & 5 deletions src/modules/bluefish/packages.config

This file was deleted.

2 changes: 1 addition & 1 deletion src/modules/decklink/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ target_include_directories(decklink PRIVATE
${FFMPEG_INCLUDE_PATH}
)
target_precompile_headers(decklink PRIVATE "StdAfx.h")
configure_file("${PROJECT_SOURCE_DIR}/packages.config" "${CMAKE_CURRENT_BINARY_DIR}/packages.config")
casparcg_add_build_dependency(decklink boost tbb ffmpeg-lib)

set_target_properties(decklink PROPERTIES FOLDER modules)
source_group(sources ./*)
Expand Down
5 changes: 0 additions & 5 deletions src/modules/decklink/packages.config

This file was deleted.

2 changes: 1 addition & 1 deletion src/modules/ffmpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ target_include_directories(ffmpeg PRIVATE
${FFMPEG_INCLUDE_PATH}
)
target_precompile_headers(ffmpeg PRIVATE "StdAfx.h")
configure_file("${PROJECT_SOURCE_DIR}/packages.config" "${CMAKE_CURRENT_BINARY_DIR}/packages.config")
casparcg_add_build_dependency(ffmpeg boost tbb ffmpeg-lib)

set_target_properties(ffmpeg PROPERTIES FOLDER modules)
source_group(sources ./*)
Expand Down
5 changes: 0 additions & 5 deletions src/modules/ffmpeg/packages.config

This file was deleted.

Loading

0 comments on commit 402af68

Please sign in to comment.