diff --git a/CMakeLists.txt b/CMakeLists.txt index b01f86a142..876e67aca3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,8 @@ set(TITLE_SEQUENCE_SHA1 "304d13a126c15bf2c86ff13b81a2f2cc1856ac8d") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v1.0.11/objects.zip") set(OBJECTS_SHA1 "8674120086929f9196560d77cada631fb478d7c0") -set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v0.0.2/replays.zip") -set(REPLAYS_SHA1 "6E034E5299A8EC30A8D0A1B93F6A30A3A6429FEC") +set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v0.0.4/replays.zip") +set(REPLAYS_SHA1 "6584368CD04EC42FDC2EB5DF26FECE9A964C27B7") option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.") option(WITH_TESTS "Build tests") @@ -293,12 +293,12 @@ if (DOWNLOAD_OBJECTS) endif () if (DOWNLOAD_REPLAYS) install(CODE - "if (EXISTS \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT}/testdata/replays/)\n\ + "if (EXISTS \${CMAKE_CURRENT_BINARY_DIR}/testdata/replays/)\n\ message(\"Using cached replays\")\n\ else () \n\ - file(DOWNLOAD ${REPLAYS_URL} \$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT}/testdata/replays/replays.zip EXPECTED_HASH SHA1=${REPLAYS_SHA1} SHOW_PROGRESS)\n\ - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT}/testdata/replays/ \"${CMAKE_COMMAND}\" -E tar xf replays.zip)\n\ - file(REMOVE \$ENV{DESTDIR}/${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT}/testdata/replays/replays.zip)\n\ + file(DOWNLOAD ${REPLAYS_URL} \${CMAKE_CURRENT_BINARY_DIR}/testdata/replays/replays.zip EXPECTED_HASH SHA1=${REPLAYS_SHA1} SHOW_PROGRESS)\n\ + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \${CMAKE_CURRENT_BINARY_DIR}/testdata/replays/ \"${CMAKE_COMMAND}\" -E tar xf replays.zip)\n\ + file(REMOVE \${CMAKE_CURRENT_BINARY_DIR}/testdata/replays/replays.zip)\n\ endif ()") endif () install(TARGETS "libopenrct2" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/openrct2.proj b/openrct2.proj index a17b469332..9ad6480940 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -72,8 +72,8 @@ 304d13a126c15bf2c86ff13b81a2f2cc1856ac8d https://github.com/OpenRCT2/objects/releases/download/v1.0.11/objects.zip 8674120086929f9196560d77cada631fb478d7c0 - https://github.com/OpenRCT2/replays/releases/download/v0.0.2/replays.zip - 6E034E5299A8EC30A8D0A1B93F6A30A3A6429FEC + https://github.com/OpenRCT2/replays/releases/download/v0.0.4/replays.zip + 6584368CD04EC42FDC2EB5DF26FECE9A964C27B7 diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt index 72a485032d..3c516443ea 100644 --- a/test/tests/CMakeLists.txt +++ b/test/tests/CMakeLists.txt @@ -214,16 +214,14 @@ target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z target_link_platform_libraries(test_tile_elements) add_test(NAME tile_elements COMMAND test_tile_elements) -if (NOT DISABLE_NETWORK) - # Replay tests - set(REPLAY_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/ReplayTests.cpp" - "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp") - add_executable(test_replays ${REPLAY_TEST_SOURCES}) - SET_CHECK_CXX_FLAGS(test_replays) - target_link_libraries(test_replays ${GTEST_LIBRARIES} libopenrct2 ${LDL} z) - target_link_platform_libraries(test_replays) - add_test(NAME replay_tests COMMAND test_replays) -endif () +# Replay tests +set(REPLAY_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/ReplayTests.cpp" + "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp") +add_executable(test_replays ${REPLAY_TEST_SOURCES}) +SET_CHECK_CXX_FLAGS(test_replays) +target_link_libraries(test_replays ${GTEST_LIBRARIES} libopenrct2 ${LDL} z) +target_link_platform_libraries(test_replays) +add_test(NAME replay_tests COMMAND test_replays) # Pathfinding test set(PATHFINDING_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pathfinding.cpp"