Appveyor CMAKE fix

This commit is contained in:
Silarn
2020-05-01 04:59:02 -05:00
parent 247944baa8
commit 168b9d7b0d
3 changed files with 21 additions and 4 deletions
+5 -1
View File
@@ -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)
+7 -1
View File
@@ -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
+9 -2
View File
@@ -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)