From 0e3b0d79f5cb96ba312b8e960f8fdbb7ed5fa48e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 21 Mar 2023 10:50:18 -0500 Subject: [PATCH 1/3] Fix llvm-16 installation with windows --- CMakeLists.txt | 4 +++- bin/release_notes.sh | 0 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 bin/release_notes.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index c81da8b590..4e657c3335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if (POLICY CMP0074) endif() if (POLICY CMP0057) - cmake_policy(SET CMP0057 NEW) # needed for llvm >= 16 + cmake_policy(SET CMP0057 NEW) # needed for llvm >= 16 endif () set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UserOverride.cmake) @@ -399,6 +399,8 @@ if (HAVE_SYMENGINE_GMP) endif() endif() +include(GNUInstallDirs) + # LLVM set(WITH_LLVM no CACHE BOOL "Build with LLVM") diff --git a/bin/release_notes.sh b/bin/release_notes.sh old mode 100644 new mode 100755 From 237cbbdc9eb7af05d26984d6cfa2339a330c59f8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 21 Mar 2023 14:49:11 -0500 Subject: [PATCH 2/3] add comment --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e657c3335..b2fe4d3e5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -399,7 +399,7 @@ if (HAVE_SYMENGINE_GMP) endif() endif() -include(GNUInstallDirs) +include(GNUInstallDirs) # For llvm>=16 # LLVM set(WITH_LLVM no From 324b2e0a012a2b86fd94110824d5618477f848c6 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 22 Mar 2023 11:49:49 -0500 Subject: [PATCH 3/3] llvm-16 fix for downstream projects --- CMakeLists.txt | 2 +- cmake/SymEngineConfig.cmake.in | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2fe4d3e5d..255c53fb75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project(symengine LANGUAGES C CXX) set(SYMENGINE_MAJOR_VERSION 0) set(SYMENGINE_MINOR_VERSION 10) -set(SYMENGINE_PATCH_VERSION 0) +set(SYMENGINE_PATCH_VERSION 1) set(SYMENGINE_VERSION ${SYMENGINE_MAJOR_VERSION}.${SYMENGINE_MINOR_VERSION}.${SYMENGINE_PATCH_VERSION}) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) diff --git a/cmake/SymEngineConfig.cmake.in b/cmake/SymEngineConfig.cmake.in index aafd8335c1..dbfc80bae5 100644 --- a/cmake/SymEngineConfig.cmake.in +++ b/cmake/SymEngineConfig.cmake.in @@ -33,6 +33,14 @@ cmake_minimum_required(VERSION 2.8.12) +if (POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() + +if (POLICY CMP0057) + cmake_policy(SET CMP0057 NEW) # needed for llvm >= 16 +endif () + set(SYMENGINE_CXX_FLAGS "@CMAKE_CXX_FLAGS@") set(SYMENGINE_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@") set(SYMENGINE_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")