diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2020-04-30 18:42:02 -0400 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2020-04-30 18:42:02 -0400 |
| commit | 8ef7db6a4c6160e9746464c5061c4f030a76015e (patch) | |
| tree | e5f167b0ecbec6121e74e59e29448aa4ae16ac4d | |
| parent | 4b265a5cd381168f73c156227c473a0ac55bb476 (diff) | |
appveyor does not build modorganizer in its standard location, so use DEPENDENCIES_DIR to find cmake_common
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c34497a3..7129c77c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,13 @@ set(project_type exe) set(executable_name ModOrganizer) set(enable_warnings OFF) -include(../cmake_common/project.cmake) +# appveyor does not build modorganizer in its standard location, so use +# DEPENDENCIES_DIR to find cmake_common +if(DEFINED DEPENDENCIES_DIR) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake) +else() + include(../cmake_common/project.cmake) +endif() set(additional_translations ${uibase_path}/src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c43ebf10..6e454fc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,13 @@ cmake_minimum_required(VERSION 3.16) -include(../../cmake_common/src.cmake) + +# appveyor does not build modorganizer in its standard location, so use +# DEPENDENCIES_DIR to find cmake_common +if(DEFINED DEPENDENCIES_DIR) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake) +else() + include(../cmake_common/src.cmake) +endif() + add_filter(NAME src/application GROUPS iuserinterface |