Skip to content

Commit

Permalink
CI/Travis: Fix newly introduced cmake failure in Travis-CI after addi…
Browse files Browse the repository at this point in the history
…ng {fmt} (#3837)

* ci: Verify Travis works with cmake fix

* ci: Scope travis-ci to only `master` branch again
  • Loading branch information
xTVaser committed Oct 17, 2020
1 parent a4b307a commit 2ff231c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
Expand Up @@ -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)
1 change: 1 addition & 0 deletions pcsx2/CMakeLists.txt
Expand Up @@ -774,6 +774,7 @@ set(pcsx2FinalSources
set(pcsx2FinalLibs
Utilities
x86emitter
fmt::fmt
${wxWidgets_LIBRARIES}
${GTK2_LIBRARIES}
${ZLIB_LIBRARIES}
Expand Down

0 comments on commit 2ff231c

Please sign in to comment.