CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1379 rename shared libraries to avoid collisions with system libraries

Browse Source 
It was unlikely, now it's impossible.
This commit is contained in:
Petr Mrázek 2016-12-28 17:23:48 +01:00
parent 481ecb178c
commit 2344ee2dcd
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -89,6 +89,7 @@ endif()
option(NBT_BUILD_SHARED "Build NBT shared library" ON) option(NBT_BUILD_SHARED "Build NBT shared library" ON)
option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF) option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF)
option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests. option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests.
set(NBT_NAME MultiMC_nbt++)
add_subdirectory(libraries/libnbtplusplus) add_subdirectory(libraries/libnbtplusplus)
add_subdirectory(libraries/ganalytics) # google analytics library add_subdirectory(libraries/ganalytics) # google analytics library

2
api/logic/CMakeLists.txt
View File

@ -491,7 +491,7 @@ set_target_properties(MultiMC_logic PROPERTIES CXX_VISIBILITY_PRESET hidden VISI
generate_export_header(MultiMC_logic) generate_export_header(MultiMC_logic)
# Link # Link
target_link_libraries(MultiMC_logic xz-embedded unpack200 ${QUAZIP_LIBRARIES} nbt++ ${ZLIB_LIBRARIES}) target_link_libraries(MultiMC_logic xz-embedded unpack200 ${QUAZIP_LIBRARIES} ${NBT_NAME} ${ZLIB_LIBRARIES})
qt5_use_modules(MultiMC_logic Core Xml Network Concurrent) qt5_use_modules(MultiMC_logic Core Xml Network Concurrent)
add_dependencies(MultiMC_logic QuaZIP) add_dependencies(MultiMC_logic QuaZIP)

2
application/CMakeLists.txt
View File

@ -333,7 +333,7 @@ qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
# Add executable # Add executable
add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS}) add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS})
target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown rainbow LocalPeer ganalytics) target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown MultiMC_rainbow LocalPeer ganalytics)
if(APPLE) if(APPLE)
find_library(OSX_CORE_FOUNDATION CoreFoundation) find_library(OSX_CORE_FOUNDATION CoreFoundation)

6
libraries/rainbow/CMakeLists.txt
View File

@ -9,7 +9,7 @@ src/rainbow.cpp
) )
add_definitions(-DRAINBOW_LIBRARY) add_definitions(-DRAINBOW_LIBRARY)
add_library(rainbow SHARED ${RAINBOW_SOURCES}) add_library(MultiMC_rainbow SHARED ${RAINBOW_SOURCES})
target_include_directories(rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") target_include_directories(MultiMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
qt5_use_modules(rainbow Core Gui) qt5_use_modules(MultiMC_rainbow Core Gui)