From cccfb4510e3e1516f9f76e4be4456caee33ad1ea Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Sun, 8 Jan 2023 00:06:23 +0000 Subject: [PATCH 1/4] [Appveyor] attempt to use sccache --- .appveyor.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2c4652e1ee..6e1b25ae01 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -11,11 +11,10 @@ version: '{build}' os: - Visual Studio 2015 - - Visual Studio 2013 + #- Visual Studio 2013 platform: - x64 - - x86 configuration: - Release @@ -26,14 +25,33 @@ build: environment: BOOST_ROOT: C:\Libraries\boost_1_63_0 CMAKE_INSTALL_PREFIX: C:\projects\stir\install\ + DEPS: C:\projects\deps + sccache_VER: 0.3.3 + +install: + - IF NOT EXIST %DEPS% mkdir %DEPS% + - cd %DEPS% + - set sccache_FULLNAME="sccache-v%sccache_VER%-x86_64-pc-windows-msvc" + - set sccache_URL="https://github.com/mozilla/sccache/releases/download/v%sccache_VER%/%sccache_FULLNAME%.zip" + - IF NOT EXIST %DEPS%\sccache-%sccache_VER%.zip appveyor DownloadFile %sccache_URL% -FileName sccache-%sccache_VER%.zip + - IF NOT EXIST %DEPS%\sccache.exe 7z x sccache-%sccache_VER%.zip -o%DEPS%\ + - IF NOT EXIST %DEPS%\sccache.exe move %sccache_FULLNAME%\*.* . build_script: + - cd C:\projects\STIR + - path=%path%;%DEPS% + - sccache --show-stats - mkdir build - mkdir install - cd build - - cmake.exe .. -DCMAKE_INSTALL_PREFIX="C:\projects\stir\install" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -DSTIR_OPENMP=ON + - cmake.exe .. -G Ninja -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -DSTIR_OPENMP=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache - cmake.exe --build . --config %CONFIGURATION% - cmake.exe --build . --target install --config %CONFIGURATION% + - sccache --show-stats + +cache: + - c:\projects\deps\sccache-%sccache_VER%.zip + - C:\Users\appveyor\AppData\Local\Mozilla\sccache\cache test_script: - cd C:\projects\stir\build From c6e014662e13dba9b40abac48d99bc85e4564991 Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Sun, 8 Jan 2023 10:55:28 +0000 Subject: [PATCH 2/4] simplify string.h inclusion --- src/buildblock/getopt.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/buildblock/getopt.c b/src/buildblock/getopt.c index fff1f5164c..45f20b6160 100644 --- a/src/buildblock/getopt.c +++ b/src/buildblock/getopt.c @@ -202,11 +202,7 @@ static char *posixly_correct; # define my_index strchr #else -# if HAVE_STRING_H || WIN32 /* Pete Wilson mod 7/28/02 */ -# include -# else -# include -# endif +#include /* Avoid depending on library functions or files whose names are inconsistent. */ From 8eaa7dccafd1cb9999875d2339bd40e4166a54cc Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Sun, 8 Jan 2023 21:48:19 +0000 Subject: [PATCH 3/4] remove sccache from CMake to test OpenMP [actions skip] --- .appveyor.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6e1b25ae01..22a16a207e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,19 +39,20 @@ install: build_script: - cd C:\projects\STIR - - path=%path%;%DEPS% - - sccache --show-stats + - REM path=%path%;%DEPS% + - REM sccache --show-stats - mkdir build - mkdir install - cd build - - cmake.exe .. -G Ninja -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -DSTIR_OPENMP=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache + - cmake.exe .. -G Ninja -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -DSTIR_OPENMP=ON + - REM DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache - cmake.exe --build . --config %CONFIGURATION% - cmake.exe --build . --target install --config %CONFIGURATION% - - sccache --show-stats + - REM sccache --show-stats cache: - c:\projects\deps\sccache-%sccache_VER%.zip - - C:\Users\appveyor\AppData\Local\Mozilla\sccache\cache + # - C:\Users\appveyor\AppData\Local\Mozilla\sccache\cache test_script: - cd C:\projects\stir\build From f4b0db409dc96f02c502ffc24c19e14db70bd9b8 Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Mon, 9 Jan 2023 08:52:21 +0000 Subject: [PATCH 4/4] just show cmake version --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 22a16a207e..0eb876100e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -44,10 +44,11 @@ build_script: - mkdir build - mkdir install - cd build + - cmake --version - cmake.exe .. -G Ninja -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -DSTIR_OPENMP=ON - REM DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache - cmake.exe --build . --config %CONFIGURATION% - - cmake.exe --build . --target install --config %CONFIGURATION% + - REM cmake.exe --build . --target install --config %CONFIGURATION% - REM sccache --show-stats cache: