From 32f45578fd7f152f3132c8891195c6d5c5c52be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 2 May 2015 01:14:35 +0200
Subject: NOISSUE fix build issues

Hopefully all
---
 CMakeLists.txt             | 7 ++++++-
 application/CMakeLists.txt | 2 +-
 logic/CMakeLists.txt       | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca94a98f..a21f23c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,6 @@ find_package(Qt5Concurrent REQUIRED)
 find_package(Qt5Network REQUIRED)
 find_package(Qt5Test REQUIRED)
 find_package(Qt5Xml REQUIRED)
-find_package(Qt5WebKitWidgets REQUIRED)
 
 include_directories(
 	${Qt5Core_INCLUDE_DIRS}
@@ -87,7 +86,13 @@ ExternalProject_Add(QuaZIP
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
 )
 include_directories("${CMAKE_BINARY_DIR}/External/Install/QuaZIP/include/quazip")
+if(UNIX)
+set(QUAZIP_LIBRARIES -L"${CMAKE_BINARY_DIR}/External/Install/QuaZIP/lib" quazip z)
+else()
 set(QUAZIP_LIBRARIES -L"${CMAKE_BINARY_DIR}/External/Install/QuaZIP/lib" quazip)
+endif()
+
+
 
 # Add the java launcher and checker
 add_subdirectory(depends/launcher)
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 31b0e62c..2518e52e 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -345,7 +345,7 @@ qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
 # Add executable
 add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS})
 target_link_libraries(MultiMC MultiMC_logic xz-embedded unpack200 iconfix libUtil LogicalGui
-	${QUAZIP_LIBRARIES} Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
+	${QUAZIP_LIBRARIES} Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent
 		${MultiMC_LINK_ADDITIONAL_LIBS})
 
 ################################ INSTALLATION AND PACKAGING ################################
diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt
index 3cea50ab..f22078c1 100644
--- a/logic/CMakeLists.txt
+++ b/logic/CMakeLists.txt
@@ -255,7 +255,7 @@ add_library(MultiMC_logic STATIC ${LOGIC_SOURCES})
 
 # Link
 target_link_libraries(MultiMC_logic xz-embedded unpack200 iconfix libUtil LogicalGui ${QUAZIP_LIBRARIES}
-	Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets
+	Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent
 		${MultiMC_LINK_ADDITIONAL_LIBS})
 
 add_dependencies(MultiMC_logic QuaZIP)
-- 
cgit v1.2.3