From 5878e4a7a9c8ce2bbbc9f0017d7c0b62b454fe9c Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 9 Jan 2020 03:55:05 +0300 Subject: update cmake-common --- appveyor.yml | 2 +- um/CMakeLists.txt | 2 +- um/cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8b3038d..a300af1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ install: - git submodule update --init --recursive build_script: - - '"%python_exe%" um/cmake/ci/build_appveyor.py --install "%install_dir%"' + - '"%python_exe%" um\cmake\cmake\build\ci\appveyor.py --install "%install_dir%"' - ps: .\.appveyor\build.ps1 -InstallDir $env:install_dir after_build: diff --git a/um/CMakeLists.txt b/um/CMakeLists.txt index b5df409..deeaa39 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/common.cmake) +include(cmake/cmake/common.cmake) add_subdirectory(service) add_subdirectory(wrappers) diff --git a/um/cmake b/um/cmake index aaf52cd..d83b675 160000 --- a/um/cmake +++ b/um/cmake @@ -1 +1 @@ -Subproject commit aaf52cd2c859fe8047f9058d3043d9eba783042b +Subproject commit d83b675f53bd18204b1f07105b3944cc9756e7d1 -- cgit v1.2.3