diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f71515..e7a4b33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,11 @@ project(plugin_python) set(project_type plugin) set(enable_warnings OFF) -include(../cmake_common/project.cmake) +if(DEFINED DEPENDENCIES_DIR) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake) +else() + include(../cmake_common/project.cmake) +endif() add_subdirectory(src/proxy) add_subdirectory(src/runner) diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt index 7ee8d36..610f756 100644 --- a/src/proxy/CMakeLists.txt +++ b/src/proxy/CMakeLists.txt @@ -1,5 +1,11 @@ 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() requires_library(python) target_include_directories(${PROJECT_NAME} PRIVATE diff --git a/src/runner/CMakeLists.txt b/src/runner/CMakeLists.txt index 2b7fbf5..0e6b464 100644 --- a/src/runner/CMakeLists.txt +++ b/src/runner/CMakeLists.txt @@ -9,8 +9,15 @@ add_compile_definitions( QT_NO_KEYWORDS PYTHONRUNNER_LIBRARY) -include(../../../cmake_common/project.cmake) -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/project.cmake) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake) +else() + include(../../../cmake_common/project.cmake) + include(../../../cmake_common/src.cmake) +endif() requires_project(game_features) requires_library(python)