From 2ff231c27d28bd5cfa903575204322a0bf7b03f5 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sat, 17 Oct 2020 00:44:39 -0400 Subject: [PATCH] CI/Travis: Fix newly introduced cmake failure in Travis-CI after adding {fmt} (#3837) * ci: Verify Travis works with cmake fix * ci: Scope travis-ci to only `master` branch again --- CMakeLists.txt | 3 --- pcsx2/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17f960410dc12..1bc43a8e3cf21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,6 +100,3 @@ else() INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/PCSX2-linux.sh" DESTINATION "${CMAKE_SOURCE_DIR}/bin") endif() endif() - -# Link Libraries -target_link_libraries(PCSX2 fmt::fmt) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index ac87c611af933..2b0db9fb73557 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -774,6 +774,7 @@ set(pcsx2FinalSources set(pcsx2FinalLibs Utilities x86emitter + fmt::fmt ${wxWidgets_LIBRARIES} ${GTK2_LIBRARIES} ${ZLIB_LIBRARIES}