ich777/CorsixTH
1
0
Fork 0
mirror of https://github.com/CorsixTH/CorsixTH.git synced 2025-07-23 04:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2272 from TheCycoONE/vcpkg_bump_oct_2022

Browse Source 
Bump vcpkg commit tag
This commit is contained in:
Alberth289346
2022-10-19 19:57:37 +02:00
committed by GitHub
parent 95746d9468 4e731c456b
commit 4fc951e0fe
9 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/Linux.yml vendored
View File

@@ -59,9 +59,9 @@ jobs:
# Build catch2
git clone --quiet https://github.com/catchorg/Catch2 \
--branch v2.13.2 --depth=1
--branch v3.1.1 --depth=1
cd Catch2
cmake . -Bbuild -DBUILD_TESTING=OFF
cmake . -Bbuild
cd build
sudo make install
cd ../../

7
CMake/CopyVcpkgSdlMixerBackends.cmake
View File

@@ -1,12 +1,5 @@
add_custom_command(TARGET CorsixTH POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/FLAC.dll"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/FLAC++.dll"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/mpg123.dll"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/modplug.dll"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/ogg.dll"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/vorbis.dll"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/vorbisenc.dll"
"${VCPKG_INSTALLED_PATH}/$<$<CONFIG:Debug>:debug/>bin/vorbisfile.dll"
$<TARGET_FILE_DIR:CorsixTH>
)

2
CMake/VcpkgDeps.cmake
View File

@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
set(VCPKG_COMMIT_SHA "e9d15c9345a44b9630b6a38f6768bfa80244f8ef")
set(VCPKG_COMMIT_SHA "13d8ccd373c70f71a1e6d76edc7b31f79a4b2119")
# Setup the various paths we are using
set(_VCPKG_SCRIPT_NAME "build_vcpkg_deps.ps1")

4
CorsixTH/CMakeLists.txt
View File

@@ -164,8 +164,8 @@ target_link_libraries(CorsixTH ${CMAKE_THREAD_LIBS_INIT})
# Find SDL_mixer
if(CORSIX_TH_USE_SDL_MIXER)
if(MSVC AND USE_VCPKG_DEPS)
find_package(sdl2-mixer CONFIG REQUIRED)
target_link_libraries(CorsixTH SDL2::SDL2_mixer)
find_package(SDL2_mixer CONFIG REQUIRED)
target_link_libraries(CorsixTH SDL2_mixer::SDL2_mixer)
else()
find_package(SDL2_mixer REQUIRED)
if(SDLMIXER_FOUND)

5
CorsixTH/CppTest/CMakeLists.txt
View File

@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
find_package(Catch2 CONFIG REQUIRED)
find_package(Catch2 3 CONFIG REQUIRED)
add_custom_target(AllTests)
@@ -29,7 +29,7 @@ include_directories(${CMAKE_SOURCE_DIR}/CorsixTH/Src/)
add_executable(UnitTests "")
target_link_libraries(UnitTests
Catch2::Catch2
Catch2::Catch2WithMain
CorsixTH_lib
${LUA_LIBRARY}
${CMAKE_DL_LIBS})
@@ -48,7 +48,6 @@ add_dependencies(AllTests UnitTests)
# List of all test files
target_sources(UnitTests
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/test_main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_th_lua.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_th_strings.cpp
)

2
CorsixTH/CppTest/test_main.cpp
View File

@@ -1,2 +0,0 @@
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"

2
CorsixTH/CppTest/test_th_lua.cpp
View File

@@ -1,5 +1,5 @@
#include "../Src/th_lua.h"
#include "catch2/catch.hpp"
#include <catch2/catch_test_macros.hpp>
TEST_CASE("luaT_rotate works", "[luaT_rotate]") {
lua_State* L = luaL_newstate();

3
CorsixTH/CppTest/test_th_strings.cpp
View File

@@ -1,7 +1,8 @@
#include <cstring>
#include "../Src/th_strings.h"
#include "catch2/catch.hpp"
#include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_string.hpp>
TEST_CASE("skip whitespace", "[skip_utf8_whitespace]") {
const char* str = " \t \n 1234";

2
scripts/build_vcpkg_deps.ps1
View File

@@ -34,7 +34,7 @@ Param(
################
$anim_view_libs = "wxwidgets"
$corsixth_libs = "ffmpeg[core,avcodec,avformat,swresample,swscale]", "freetype", "lua[tools]", "luafilesystem", "lpeg", "sdl2", "sdl2-mixer[dynamic-load,libflac,mpg123,libmodplug,libvorbis]", "luasocket", "luasec", "catch2"
$corsixth_libs = "ffmpeg[core,avcodec,avformat,swresample,swscale]", "freetype", "lua[tools]", "luafilesystem", "lpeg", "sdl2", "sdl2-mixer[libmodplug,nativemidi]", "luasocket", "luasec", "catch2"
$vcpkg_git_url = "https://github.com/CorsixTH/vcpkg"