Merge pull request #1959 from isuruf/llvm16-win

Fix llvm-16 installation with windows
symengine · Mar 23, 2023 · ef93156 · ef93156
2 parents 2b575b9 + 324b2e0
commit ef93156
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git 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)
@@ -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})
@@ -399,6 +399,8 @@ if (HAVE_SYMENGINE_GMP)
     endif()
 endif()
 
+include(GNUInstallDirs)  # For llvm>=16
+
 # LLVM
 set(WITH_LLVM no
     CACHE BOOL "Build with LLVM")

diff --git a/bin/release_notes.sh b/bin/release_notes.sh
diff --git 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@")