From fa4bfcdbe2f4455a4efb85aa08da38170588feb6 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 30 Mar 2020 13:43:10 +0300 Subject: update cmake-common --- .appveyor.yml | 4 +++- um/CMakeLists.txt | 2 +- um/cmake | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0bb0a7b..bac19e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -32,7 +32,9 @@ install: - git submodule update --init --recursive build_script: - - '"%python_exe%" um\cmake\cmake\build\ci\appveyor.py --install "%install_dir%"' + - cd um\cmake + - '"%python_exe%" -m project.ci.appveyor.cmake --install "%install_dir%"' + - cd ..\.. - ps: .\.appveyor\build.ps1 -InstallDir $env:install_dir after_build: diff --git a/um/CMakeLists.txt b/um/CMakeLists.txt index deeaa39..b5df409 100644 --- a/um/CMakeLists.txt +++ b/um/CMakeLists.txt @@ -1,7 +1,7 @@ # WIN32_LEAN_AND_MEAN shouldn't be defined, it masks CTL_CODE: set(CC_WINDOWS_DEF OFF) -include(cmake/cmake/common.cmake) +include(cmake/common.cmake) add_subdirectory(service) add_subdirectory(wrappers) diff --git a/um/cmake b/um/cmake index d83b675..0f474b6 160000 --- a/um/cmake +++ b/um/cmake @@ -1 +1 @@ -Subproject commit d83b675f53bd18204b1f07105b3944cc9756e7d1 +Subproject commit 0f474b66fe1d6cfdb286deb1ef19e2b37e60d4ee -- cgit v1.2.3