diff options
| author | Brian Munro <brian.alexander.munro@gmail.com> | 2019-02-19 06:30:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 06:30:30 +0200 |
| commit | 046a72346c82ac48f770ae6e015025f24d019460 (patch) | |
| tree | f36195befdde1b14ec6cdc83d817778c4542d88d | |
| parent | f9ac64c65d873d2b677373cd557c5bf2c6ffa85c (diff) | |
| parent | f0f672f9b7ff01def3b56cb63ce14480ca30e971 (diff) | |
Merge pull request #656 from ModOrganizer2/Appveyor
Appveyor test build process, current project only
| -rw-r--r-- | appveyor.yml | 12 | ||||
| -rw-r--r-- | readme.md | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..88530f52 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,12 @@ +version: 1.0.{build} +image: Visual Studio 2017 +build_script: +- cmd: >- + + git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null + + mkdir c:\projects\modorganizer-build -type directory + + cd c:\projects\modorganizer-umbrella + + C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME% @@ -1,3 +1,5 @@ +[](https://ci.appveyor.com/project/Modorganizer2/modorganizer)
+
# Mod Organizer
Mod Organizer (MO) is a tool for managing mod collections of arbitrary size. It is specifically designed for people who like to experiment with mods and thus need an easy and reliable way to install and uninstall them.
@@ -82,4 +84,3 @@ Here is a complete list: ### Unused Repositories
* https://github.com/Modorganizer2/modorganizer-hookdll
* https://github.com/TanninOne/modorganizer-tool_nmmimport
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b241d99a..42207ee9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -248,7 +248,8 @@ SOURCE_GROUP(Headers FILES ${organizer_HDRS}) SOURCE_GROUP(UI FILES ${organizer_UIS}) # MO projects -SET(default_project_path "${CMAKE_SOURCE_DIR}/..") +SET(dependency_project_path "${DEPENDENCIES_DIR}") +SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") @@ -295,7 +296,7 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src ${project_path}/bsatk/src ${project_path}/esptk/src ${project_path}/archive/src - ${project_path}/../usvfs/include + ${dependency_project_path}/usvfs/include ${project_path}/game_gamebryo/src/gamebryo ${project_path}/game_gamebryo/src/creation ${project_path}/game_features/src |