Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ jobs:
gist_file_name: ${{env.GIT_REPOSITORY}}.${{env.GIT_BRANCH}}.${{env.GITHUB_WORKFLOW}}.json
file_path: ./ci/github/tests_not_available.badge.json

- name: Install CMake (issue \#158)
working-directory: ${{env.GITHUB_WORKSPACE}}
shell: cmd
run: call ci\github\install_cmake.bat

- name: Install Doxygen
working-directory: ${{env.GITHUB_WORKSPACE}}
shell: cmd
Expand Down
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Changes for 0.10.0

* Fixed issue #157: Compilation fails on Github Action: `fatal error C1083: Cannot open include file: 'atlbase.h': No such file or directory`.
* Fixed issue #158: Compilation fails on Github Action: `CPack error : Problem running WiX.`.


Changes for 0.9.0

* Fixed issue #111: Move code from the shell extension to the core.
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ The following software must be installed on the system for compiling source code
* [exprtk d312ba9](https://github.com/ArashPartow/exprtk) (downloaded automatically)
* [File and libmagic for Windows v5.38 + modifications](https://github.com/Cirn09/file-windows/tree/39f1624b4c95a0ab657a1084d50069270ebb8947)
* [zlib v1.2.11](https://github.com/madler/zlib/releases/tag/v1.2.11)
* [CMake v3.4.3](http://www.cmake.org/) (or newer)
* [CMake v3.4.3](http://www.cmake.org/) (tested up to 3.29.7)
* [imneme/pcg-cpp](https://github.com/imneme/pcg-cpp/tree/428802d1a5634f96bcd0705fab379ff0113bcf13) (or newer)
* (optional) [Grip (GitHub Readme Instant Preview)](https://github.com/joeyespo/grip) v4.5.2 (or newer)


### Windows Requirements ###

* Microsoft Visual C++ 2017 or newer
* (optional) [WiX Toolset](https://wixtoolset.org/) v3.11.2 (or newer)
* (optional) [WiX Toolset](https://wixtoolset.org/) v3.11.2 (tested up to 3.14.1.8722)



Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ matrix:
before_build:
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\list_services_status.bat
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\list_registry_keys.bat
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_cmake.bat
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_doxygen.bat
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_googletest.bat
- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_tinyxml2.bat
Expand Down
11 changes: 11 additions & 0 deletions ci/appveyor/install_cmake.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@echo off

:: Validate appveyor's environment
if "%APPVEYOR_BUILD_FOLDER%"=="" (
echo Please define 'APPVEYOR_BUILD_FOLDER' environment variable.
exit /B 1
)

:: Call matching script for windows
call "%APPVEYOR_BUILD_FOLDER%\ci\windows\%~n0.bat"
if %errorlevel% neq 0 exit /b %errorlevel%
11 changes: 11 additions & 0 deletions ci/github/install_cmake.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@echo off

:: Validate GitHub CI's environment
if "%GITHUB_WORKSPACE%"=="" (
echo Please define 'GITHUB_WORKSPACE' environment variable.
exit /B 1
)

:: Call matching script for windows
call "%GITHUB_WORKSPACE%\ci\windows\%~n0.bat"
if %errorlevel% neq 0 exit /b %errorlevel%
78 changes: 78 additions & 0 deletions ci/windows/install_cmake.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
@echo off

:: Install CMake.
:: https://cmake.org/download/
:: https://github.com/Kitware/CMake/releases/latest

echo Installing CMake...
set CMAKE_MSI_URL=https://github.com/Kitware/CMake/releases/download/v3.29.7/cmake-3.29.7-windows-x86_64.msi
set CMAKE_MSI_FILE=%TEMP%\cmake-3.29.7-windows-x86_64.msi
set CMAKE_MSI_INSTALL_DIR=C:\Program Files\CMake

:: Validate if python launcher is installed
where py.exe >NUL 2>NUL
if errorlevel 1 (
echo Command failed. Please install python and python launcher to continue.
exit /B %errorlevel%
)
echo Found python interpreter
python --version

:: Validate if pip is installed
where pip.exe >NUL 2>NUL
if errorlevel 1 (
echo Command failed. Please install pip ^(Package Installer Python^) to continue.
exit /B %errorlevel%
)

:: Download installer
echo Downloading %CMAKE_MSI_URL%...
python -c "import urllib.request; import os; urllib.request.urlretrieve(os.getenv('CMAKE_MSI_URL'),os.getenv('CMAKE_MSI_FILE'));"
if errorlevel 1 (
echo Command failed. Unable to download cmake installer.
exit /B %errorlevel%
)
if NOT EXIST "%CMAKE_MSI_FILE%" (
echo Download failed. The file '%CMAKE_MSI_FILE%' is not found.
exit /B %errorlevel%
)
echo done.
echo.

:: Validate administrative permissions...
:: https://stackoverflow.com/questions/4051883/batch-script-how-to-check-for-admin-rights
echo Checking administrative permissions...
net session >nul 2>&1
if %errorLevel% == 0 (
echo Found administrative permissions. Installation in quiet mode enabled.
set QUIET_MODE_ARGS=/quiet /qn
) else (
echo Administrative permissions not found. Installation in interractive mode will be used.
)

:: Installing MSI
REM Note: `/quiet /qn` is not available when launched in user mode.
echo Running CMake installer...
echo QUIET_MODE_ARGS=%QUIET_MODE_ARGS%
msiexec /i "%CMAKE_MSI_FILE%" %QUIET_MODE_ARGS% /norestart /log "%TEMP%\cmake_insall.log"
if errorlevel 1 (
echo Failed to install MSI package "%CMAKE_MSI_FILE%".
exit /B %errorlevel%
)
echo done.
echo.

:: Searching for cmake executable
echo Searching for cmake executable...
set PATH=%CMAKE_MSI_INSTALL_DIR%\bin;%PATH%
where cmake.exe 1>NUL 2>NUL
if errorlevel 1 (
echo Error: CMake not installed on system.
exit /B %errorlevel%
)
echo CMake found.
cmake --version
echo.

echo CMake was installed on the system without error.
echo.