From 4df6b909785110e115421cd06ae177ca5e8a751e Mon Sep 17 00:00:00 2001 From: m-aXimilian <56168660+m-aXimilian@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:06:53 +0200 Subject: [PATCH] Explicitly disable the configure command for eigen (ext) (#115) * explicitly disable the configure command for eigen (ext) * comment magic line * bump version number * correct version number inc Co-authored-by: ptahmose --------- Co-authored-by: ptahmose --- CMakeLists.txt | 2 +- Src/libCZI/Doc/version-history.markdown | 3 ++- cmake/ExternalEIGEN3.cmake | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c51297f8..9a505067 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15) cmake_policy(SET CMP0091 NEW) # enable new "MSVC runtime library selection" (https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html) project(libCZI - VERSION 0.62.1 + VERSION 0.62.2 HOMEPAGE_URL "https://github.com/ZEISS/libczi" DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI") diff --git a/Src/libCZI/Doc/version-history.markdown b/Src/libCZI/Doc/version-history.markdown index 3b5f38ce..87a4bcc4 100644 --- a/Src/libCZI/Doc/version-history.markdown +++ b/Src/libCZI/Doc/version-history.markdown @@ -27,4 +27,5 @@ version history {#version_history} 0.61.1 | [110](https://github.com/ZEISS/libczi/pull/110) | some code cleanup 0.61.2 | [111](https://github.com/ZEISS/libczi/pull/111) | update libcurl to 8.9.1 (for build with `LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL=OFF`), enable SChannel (on Windows) by default 0.62.0 | [112](https://github.com/ZEISS/libczi/pull/112) | add Azure-SDK based reader for reading from Azure Blob Storage, raise requirement to C++14 for building libCZI (previously C++11 was sufficient) because Azure-SDK requires C++14 - 0.62.1 | [114](https://github.com/ZEISS/libczi/pull/114) | improve build system fixing issues with msys2 and mingw-w64, cosmetic changes \ No newline at end of file + 0.62.1 | [114](https://github.com/ZEISS/libczi/pull/114) | improve build system fixing issues with msys2 and mingw-w64, cosmetic changes + 0.62.2 | [115](https://github.com/ZEISS/libczi/pull/115) | enabling building with clang on windows diff --git a/cmake/ExternalEIGEN3.cmake b/cmake/ExternalEIGEN3.cmake index eeaed988..c6cf8bc9 100644 --- a/cmake/ExternalEIGEN3.cmake +++ b/cmake/ExternalEIGEN3.cmake @@ -16,6 +16,7 @@ ExternalProject_Add( "-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}" "-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}" UPDATE_COMMAND "" + CONFIGURE_COMMAND "" # w/o this the build step fails with clang on windows BUILD_COMMAND "" INSTALL_COMMAND "" LOG_DOWNLOAD ON # redirect output to log-file (so that we have less clutter)