From a0eb00b6b6c49fdb4cadb5cc17e432ee2ecbbee7 Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Thu, 8 Oct 2015 23:56:07 +0200
Subject: more work on build system

---
 .gitignore         |  6 ++++++
 CMakeLists.txt     |  8 ++++----
 src/CMakeLists.txt | 11 ++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 78e57a55..c5c631d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,9 @@ src/moc_*.cpp
 src/ui_*.h
 src/*.qrc.depends
 src/Modorganizer.*
+CMakeLists.txt.user
+edit
+stderr.log
+stdout.log
+build
+.idea
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfd8f902..e255f2b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,14 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-SET(DEPENDENCIES_DIR CACHE PATH "")
+PROJECT(organizer)
 
+SET(DEPENDENCIES_DIR CACHE PATH "")
 # hint to find qt in dependencies path
-SET(CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake)
+LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake)
 
 FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam)
 GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY)
 
-FILE(GLOB_RECURSE ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib*/zlib.h)
-GET_FILENAME_COMPONENT(ZLIB_ROOT ${ZLIB_ROOT} DIRECTORY)
+SET(ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib)
 
 ADD_SUBDIRECTORY(src)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab981e1b..c2d0b42a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
 CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
-PROJECT(organizer)
 
 CMAKE_POLICY(SET CMP0020 NEW)
 #CMAKE_POLICY(SET CMP0043 NEW)
@@ -167,7 +166,6 @@ SET(organizer_HDRS
     aboutdialog.h
     json.h
     safewritefile.h
-    pdll.h
     modflagicondelegate.h
     genericicondelegate.h
     organizerproxy.h
@@ -208,14 +206,12 @@ SET(organizer_UIS
     mainwindow.ui
     lockeddialog.ui
     installdialog.ui
-    fomodinstallerdialog.ui
     finddialog.ui
     editexecutablesdialog.ui
     downloadlistwidgetcompact.ui
     downloadlistwidget.ui
     credentialsdialog.ui
     categoriesdialog.ui
-    baincomplexinstallerdialog.ui
     activatemodsdialog.ui
     profileinputdialog.ui
     savetextasdialog.ui
@@ -283,8 +279,9 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/esptk/src
                     ${project_path}/archive/src
                     ${project_path}/plugin/game_features/src)
-INCLUDE_DIRECTORIES(shared)
-LINK_DIRECTORIES(${lib_path})
+INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
+LINK_DIRECTORIES(${lib_path}
+                 ${project_path}/zlib/lib)
 
 ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
 
@@ -301,7 +298,7 @@ SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO
                       "/LTCG /INCREMENTAL:NO /LARGEADDRESSAWARE /OPT:REF /OPT:ICF")
 
 
-QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebkitWidgets)
+QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebEngineWidgets)
 
 
 ###############
-- 
cgit v1.3.1