From 812f00eb81158bfb4c2d61b228c0c1c796641ac1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 8 Feb 2022 16:33:30 +0100 Subject: refactor(build): link rainbow statically --- libraries/rainbow/CMakeLists.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'libraries/rainbow/CMakeLists.txt') diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index 833538e3..6264ca71 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -8,15 +8,10 @@ set(RAINBOW_SOURCES src/rainbow.cpp ) -add_definitions(-DRAINBOW_LIBRARY) -add_library(Launcher_rainbow SHARED ${RAINBOW_SOURCES}) -target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +add_library(Launcher_rainbow ${RAINBOW_SOURCES}) +target_compile_definitions(Launcher_rainbow PRIVATE RAINBOW_LIBRARY) +target_compile_definitions(Launcher_rainbow PRIVATE RAINBOW_STATIC) +target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}") target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui) -# Install it -install( - TARGETS Launcher_rainbow - RUNTIME DESTINATION ${LIBRARY_DEST_DIR} - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} -) -- cgit From a60b2feb5ff018dff18286e4164d599f88c4c18a Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 12 Feb 2022 16:56:35 +0100 Subject: Revert "refactor(build): link rainbow statically" Windows build fails for some reason. Needs to be investigated later This reverts commit 812f00eb81158bfb4c2d61b228c0c1c796641ac1. --- libraries/rainbow/CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'libraries/rainbow/CMakeLists.txt') diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index 6264ca71..833538e3 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -8,10 +8,15 @@ set(RAINBOW_SOURCES src/rainbow.cpp ) -add_library(Launcher_rainbow ${RAINBOW_SOURCES}) -target_compile_definitions(Launcher_rainbow PRIVATE RAINBOW_LIBRARY) -target_compile_definitions(Launcher_rainbow PRIVATE RAINBOW_STATIC) -target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}") +add_definitions(-DRAINBOW_LIBRARY) +add_library(Launcher_rainbow SHARED ${RAINBOW_SOURCES}) +target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui) +# Install it +install( + TARGETS Launcher_rainbow + RUNTIME DESTINATION ${LIBRARY_DEST_DIR} + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} +) -- cgit From 61db1c46beb465c33124ec4f34dfdcefd4d804d3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 12 Feb 2022 17:02:54 +0100 Subject: fix: use our own prefix for rainbow lib --- launcher/CMakeLists.txt | 2 +- libraries/rainbow/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libraries/rainbow/CMakeLists.txt') diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 1156fc08..3d2d4382 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -959,7 +959,7 @@ target_link_libraries(Launcher_logic Launcher_iconfix QuaZip::QuaZip hoedown - Launcher_rainbow + PolyMC_rainbow LocalPeer ) diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index 833538e3..a07135c3 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -9,14 +9,14 @@ src/rainbow.cpp ) add_definitions(-DRAINBOW_LIBRARY) -add_library(Launcher_rainbow SHARED ${RAINBOW_SOURCES}) -target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +add_library(PolyMC_rainbow SHARED ${RAINBOW_SOURCES}) +target_include_directories(PolyMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui) +target_link_libraries(PolyMC_rainbow Qt5::Core Qt5::Gui) # Install it install( - TARGETS Launcher_rainbow + TARGETS PolyMC_rainbow RUNTIME DESTINATION ${LIBRARY_DEST_DIR} LIBRARY DESTINATION ${LIBRARY_DEST_DIR} ) -- cgit