diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-03-30 13:43:10 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-04-05 20:48:50 +0300 |
| commit | fa4bfcdbe2f4455a4efb85aa08da38170588feb6 (patch) | |
| tree | 29c47f3dd88805feae040e892daeedcc28c602f7 | |
| parent | AppVeyor: fast_finish (diff) | |
| download | windows7-drivers-fa4bfcdbe2f4455a4efb85aa08da38170588feb6.tar.gz windows7-drivers-fa4bfcdbe2f4455a4efb85aa08da38170588feb6.zip | |
update cmake-common
| -rw-r--r-- | .appveyor.yml | 4 | ||||
| -rw-r--r-- | um/CMakeLists.txt | 2 | ||||
| m--------- | um/cmake | 0 |
3 files changed, 4 insertions, 2 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 -Subproject d83b675f53bd18204b1f07105b3944cc9756e7d +Subproject 0f474b66fe1d6cfdb286deb1ef19e2b37e60d4e |