From 26acc836d9c9a0be5363c306f825f33602298c5d Mon Sep 17 00:00:00 2001 From: Philipp David Date: Mon, 21 Mar 2022 09:40:20 +0100 Subject: [PATCH] Revert "fix: use our own prefix for rainbow lib" This reverts commit 61db1c46beb465c33124ec4f34dfdcefd4d804d3. --- launcher/CMakeLists.txt | 2 +- libraries/rainbow/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 6491ccce..ab031a00 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -941,7 +941,7 @@ target_link_libraries(Launcher_logic Launcher_iconfix QuaZip::QuaZip hoedown - PolyMC_rainbow + Launcher_rainbow LocalPeer ) diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index a07135c3..833538e3 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -9,14 +9,14 @@ src/rainbow.cpp ) add_definitions(-DRAINBOW_LIBRARY) -add_library(PolyMC_rainbow SHARED ${RAINBOW_SOURCES}) -target_include_directories(PolyMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +add_library(Launcher_rainbow SHARED ${RAINBOW_SOURCES}) +target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(PolyMC_rainbow Qt5::Core Qt5::Gui) +target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui) # Install it install( - TARGETS PolyMC_rainbow + TARGETS Launcher_rainbow RUNTIME DESTINATION ${LIBRARY_DEST_DIR} LIBRARY DESTINATION ${LIBRARY_DEST_DIR} )