diff options
author | Mario Emmenlauer <memmenlauer@biodataanalysis.de> | 2021-08-05 15:28:28 +0200 |
---|---|---|
committer | Mario Emmenlauer <memmenlauer@biodataanalysis.de> | 2021-08-11 19:27:56 +0200 |
commit | c371e4ad3561b4ab38807f0de10aaa93b552e999 (patch) | |
tree | 9972ce879ed9a5d5884fc7602f328d86b237a57f /build | |
parent | 22bb550f49cd91dc9eec69fab35a4b7485485009 (diff) | |
download | thrift-c371e4ad3561b4ab38807f0de10aaa93b552e999.tar.gz |
Separate the cmake 'build' and 'install' targets
Diffstat (limited to 'build')
-rw-r--r-- | build/appveyor/CYGWIN-appveyor-build.bat | 2 | ||||
-rw-r--r-- | build/appveyor/MINGW-appveyor-build.bat | 2 | ||||
-rw-r--r-- | build/appveyor/MSVC-appveyor-build.bat | 6 | ||||
-rw-r--r-- | build/appveyor/MSYS-appveyor-build.bat | 2 | ||||
-rw-r--r-- | build/docker/msvc2017/build-compiler.bat | 2 | ||||
-rw-r--r-- | build/docker/msvc2017/build.bat | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/build/appveyor/CYGWIN-appveyor-build.bat b/build/appveyor/CYGWIN-appveyor-build.bat index edac6b6dc..eded69926 100644 --- a/build/appveyor/CYGWIN-appveyor-build.bat +++ b/build/appveyor/CYGWIN-appveyor-build.bat @@ -31,5 +31,5 @@ SET CMAKEARGS=^ :: -DCMAKE_CXX_STANDARD=11 ^ @ECHO ON -%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% --target install" || EXIT /B +%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% && cmake --install . --config %CONFIGURATION%" || EXIT /B @ECHO OFF diff --git a/build/appveyor/MINGW-appveyor-build.bat b/build/appveyor/MINGW-appveyor-build.bat index 59f690c48..d7404ae66 100644 --- a/build/appveyor/MINGW-appveyor-build.bat +++ b/build/appveyor/MINGW-appveyor-build.bat @@ -30,5 +30,5 @@ SET CMAKEARGS=^ -DWITH_PYTHON=OFF @ECHO ON -%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% --target install" || EXIT /B +%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% && cmake --install . --config %CONFIGURATION%" || EXIT /B @ECHO OFF diff --git a/build/appveyor/MSVC-appveyor-build.bat b/build/appveyor/MSVC-appveyor-build.bat index 69383f2a9..2b400e393 100644 --- a/build/appveyor/MSVC-appveyor-build.bat +++ b/build/appveyor/MSVC-appveyor-build.bat @@ -54,6 +54,6 @@ cmake "%SRCDIR%" ^ -DWITH_PYTHON=%WITH_PYTHON% || EXIT /B @ECHO OFF -cmake --build . ^ - --config "%CONFIGURATION%" ^ - --target install || EXIT /B +cmake --build . --config "%CONFIGURATION%" || EXIT /B + +cmake --install . --config "%CONFIGURATION%" || EXIT /B diff --git a/build/appveyor/MSYS-appveyor-build.bat b/build/appveyor/MSYS-appveyor-build.bat index 95b7669bd..46794ee0d 100644 --- a/build/appveyor/MSYS-appveyor-build.bat +++ b/build/appveyor/MSYS-appveyor-build.bat @@ -44,5 +44,5 @@ SET CMAKEARGS=-G\"%GENERATOR%\" ^ -DWITH_SHARED_LIB=OFF ^ -DWITH_STATIC_LIB=ON -%BASH% -lc "mkdir %BUILDDIR_MSYS% && cd %BUILDDIR_MSYS% && %CMAKE% %SRCDIR_MSYS% %CMAKEARGS% && %CMAKE% --build . --config %CONFIGURATION% --target install" || EXIT /B +%BASH% -lc "mkdir %BUILDDIR_MSYS% && cd %BUILDDIR_MSYS% && %CMAKE% %SRCDIR_MSYS% %CMAKEARGS% && %CMAKE% --build . --config %CONFIGURATION% && %CMAKE% --install . --config %CONFIGURATION%" || EXIT /B @ECHO OFF diff --git a/build/docker/msvc2017/build-compiler.bat b/build/docker/msvc2017/build-compiler.bat index 5534428b4..a7ed47984 100644 --- a/build/docker/msvc2017/build-compiler.bat +++ b/build/docker/msvc2017/build-compiler.bat @@ -41,4 +41,4 @@ cmake --build . --target thrift-compiler --config Release || EXIT /B cmake --build . --target check || EXIT /B :: Install -cmake --build . --target install
\ No newline at end of file +cmake --install .
\ No newline at end of file diff --git a/build/docker/msvc2017/build.bat b/build/docker/msvc2017/build.bat index 018805bca..bdf151225 100644 --- a/build/docker/msvc2017/build.bat +++ b/build/docker/msvc2017/build.bat @@ -42,4 +42,4 @@ cmake --build . --config Release || EXIT /B cmake --build . --target check || EXIT /B :: Install -cmake --build . --target install +cmake --install . |