diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 10:32:07 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-12-05 10:32:07 +0000 |
| commit | 0dedf5a875753f75fd2d9735e9e8f3a9f4dabcb5 (patch) | |
| tree | 07b88fb5af7d7e7680e7a7ba0269c866bb659188 /src/CMakeLists.txt | |
| parent | 1a12b1f1f6256139427c2516d314f25c593087c5 (diff) | |
| parent | 688e149c96c29d8249c9db416f5773cfc7baad6d (diff) | |
Merge remote-tracking branch 'remotes/TanninOne/master' into issue/344
# Conflicts:
# src/shared/fallout3info.h
# src/shared/falloutnvinfo.h
# src/shared/gameinfo.h
# src/shared/oblivioninfo.h
# src/shared/skyriminfo.h
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22b725de..86d1e4c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,6 +35,11 @@ SET(organizer_SRCS modlist.cpp modinfodialog.cpp modinfo.cpp + modinfobackup.cpp + modinfoforeign.cpp + modinfooverwrite.cpp + modinforegular.cpp + modinfowithconflictinfo.cpp messagedialog.cpp mainwindow.cpp main.cpp @@ -125,6 +130,11 @@ SET(organizer_HDRS modlist.h modinfodialog.h modinfo.h + modinfobackup.h + modinfoforeign.h + modinfooverwrite.h + modinforegular.h + modinfowithconflictinfo.h messagedialog.h mainwindow.h loghighlighter.h @@ -272,16 +282,20 @@ SET(default_project_path "${CMAKE_SOURCE_DIR}/..") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") -SET(lib_path "${project_path}/../install/libs") +SET(lib_path "${project_path}/../../install/libs") + + +MESSAGE(STATUS ${lib_path}) +MESSAGE(STATUS ${project_path}) INCLUDE_DIRECTORIES(${project_path}/uibase/src ${project_path}/bsatk/src ${project_path}/esptk/src ${project_path}/archive/src - ${project_path}/plugin/game_features/src) + ${project_path}/game_features/src) INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS}) LINK_DIRECTORIES(${lib_path} - ${project_path}/zlib/lib) + ${project_path}/../zlib/lib) ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS) @@ -298,7 +312,7 @@ SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /INCREMENTAL:NO /LARGEADDRESSAWARE /OPT:REF /OPT:ICF") -QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebEngineWidgets) +QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebKitWidgets) ############### |