Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
SupSuper committed Mar 10, 2019
1 parent 6b2a9bf commit 10c182a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
9 changes: 5 additions & 4 deletions appveyor-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ before_build:
- vcpkg install sdl2 boost-locale boost-system boost-program-options boost-filesystem boost-uuid boost-crc
- vcpkg upgrade --no-dry-run
- git submodule update --init --recursive
- curl http://s2.jonnyh.net/pub/cd_minimal.iso.xz -o data\cd.iso.xz
- 7z e data\cd.iso.xz -odata\
- curl http://s2.jonnyh.net/pub/cd_minimal.iso.xz -o temp\cd.iso.xz
- 7z e temp\cd.iso.xz -odata\
- choco install ninja
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VCVARS_ARCH%
build_script:
Expand All @@ -42,15 +42,16 @@ after_build:
- copy bin\*.dll OpenApoc-%OPENAPOC_VERSION%\
- copy bin\OpenApoc.exe OpenApoc-%OPENAPOC_VERSION%\
- del data\cd.iso
- del data\cd.iso.xz
- xcopy /E data OpenApoc-%OPENAPOC_VERSION%\data\
- copy portable.txt OpenApoc-%OPENAPOC_VERSION%\
- copy README.md OpenApoc-%OPENAPOC_VERSION%\
- copy README.md OpenApoc-%OPENAPOC_VERSION%\README.txt
- copy README_HOTKEYS.txt OpenApoc-%OPENAPOC_VERSION%\
- 7z a %OPENAPOC_FILENAME% OpenApoc-%OPENAPOC_VERSION% -mx=9 -myx=7
- copy bin\OpenApoc.pdb OpenApoc-%OPENAPOC_VERSION%\
- 7z a %OPENAPOC_DEBUG_FILENAME% OpenApoc-%OPENAPOC_VERSION%\*.pdb -mx=9 -myx=7
- appveyor PushArtifact %OPENAPOC_FILENAME%
- appveyor PushArtifact %OPENAPOC_DEBUG_FILENAME%
before_test:
- 7z e temp\cd.iso.xz -odata\
test_script:
- ctest -V -C %CONFIGURATION%
9 changes: 5 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ before_build:
- vcpkg install sdl2 boost-locale boost-system boost-program-options boost-filesystem boost-uuid boost-crc
- vcpkg upgrade --no-dry-run
- git submodule update --init --recursive
- curl http://s2.jonnyh.net/pub/cd_minimal.iso.xz -o data\cd.iso.xz
- 7z e data\cd.iso.xz -odata\
- curl http://s2.jonnyh.net/pub/cd_minimal.iso.xz -o temp\cd.iso.xz
- 7z e temp\cd.iso.xz -odata\
- choco install nsis -pre
- choco install ninja
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VCVARS_ARCH%
Expand All @@ -43,10 +43,9 @@ after_build:
- copy bin\*.dll OpenApoc-%OPENAPOC_VERSION%\
- copy bin\*.exe OpenApoc-%OPENAPOC_VERSION%\
- del data\cd.iso
- del data\cd.iso.xz
- xcopy /E data OpenApoc-%OPENAPOC_VERSION%\data\
- copy portable.txt OpenApoc-%OPENAPOC_VERSION%\
- copy README.md OpenApoc-%OPENAPOC_VERSION%\
- copy README.md OpenApoc-%OPENAPOC_VERSION%\README.txt
- copy README_HOTKEYS.txt OpenApoc-%OPENAPOC_VERSION%\
- 7z a %OPENAPOC_FILENAME% OpenApoc-%OPENAPOC_VERSION%
- copy bin\*.pdb OpenApoc-%OPENAPOC_VERSION%\
Expand All @@ -55,5 +54,7 @@ after_build:
- appveyor PushArtifact %OPENAPOC_DEBUG_FILENAME%
- '"C:\Program Files (x86)\NSIS\makensis.exe" /DGAME_VERSION=%OPENAPOC_VERSION% install\windows\installer.nsi'
- appveyor PushArtifact install\windows\install-openapoc-%OPENAPOC_VERSION%.exe
before_test:
- 7z e temp\cd.iso.xz -odata\
test_script:
- ctest -V -C %CONFIGURATION%
5 changes: 5 additions & 0 deletions framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,11 @@ target_include_directories(OpenApoc_Framework PUBLIC ${GLM_INCLIDE_DIR})
if(WIN32)
find_package(SDL2 CONFIG REQUIRED)
target_link_libraries(OpenApoc_Framework PRIVATE SDL2::SDL2 SDL2::SDL2main)
#Workaround vcpkg bug
set_target_properties(SDL2::SDL2 SDL2::SDL2main PROPERTIES
MAP_IMPORTED_CONFIG_MINSIZEREL Release
MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
)
else()
find_package(PkgConfig)
pkg_check_modules(PC_SDL2 REQUIRED sdl2>=2.0)
Expand Down

0 comments on commit 10c182a

Please sign in to comment.