summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTannin <sherb@gmx.net>2015-09-26 11:39:30 +0200
committerTannin <sherb@gmx.net>2015-09-26 11:39:30 +0200
commit462c549f7725810e55131a62f731357c6b2396ae (patch)
tree13935343d1694df98c57134ff37242ceaf9909fd
parent1f8c24ee7a8633f8b00f5615b6646bf7fcbf78a2 (diff)
added cmake build system
-rw-r--r--CMakeLists.txt5
-rw-r--r--src/CMakeLists.txt15
2 files changed, 8 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 989eb9d4..cfd8f902 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(DEPENDENCIES_DIR CACHE PATH "")
# hint to find qt in dependencies path
-FILE(GLOB_RECURSE QT5_FIND_MODULE ${DEPENDENCIES_DIR}/qt5.git/qtbase/bin/qmake.exe)
-GET_FILENAME_COMPONENT(QT5_FIND_MODULE ${QT5_FIND_MODULE} DIRECTORY)
-GET_FILENAME_COMPONENT(QT5_FIND_MODULE ${QT5_FIND_MODULE} DIRECTORY)
-LIST(APPEND CMAKE_PREFIX_PATH ${QT5_FIND_MODULE}/lib/cmake)
+SET(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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67b4f196..ab981e1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -272,28 +272,27 @@ FIND_PACKAGE(zlib REQUIRED)
# MO projects
+SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
+GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
-SET(project_path "${CMAKE_SOURCE_DIR}/.." CACHE PATH "path to the other mo projects")
+SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
+SET(lib_path "${project_path}/../install/libs")
INCLUDE_DIRECTORIES(${project_path}/uibase/src
${project_path}/bsatk/src
${project_path}/esptk/src
${project_path}/archive/src
${project_path}/plugin/game_features/src)
-
-LINK_DIRECTORIES(${project_path}/uibase/src
- ${project_path}/esptk/src
- ${project_path}/bsatk/src)
-
-
INCLUDE_DIRECTORIES(shared)
+LINK_DIRECTORIES(${lib_path})
+
ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS})
TARGET_LINK_LIBRARIES(ModOrganizer
Qt5::Widgets Qt5::WinExtras Qt5::WebKitWidgets
${Boost_LIBRARIES}
- ${ZLIB_LIBRARIES}
+ zlibstatic
uibase esptk bsatk
Dbghelp advapi32 Version Shlwapi)