Merge pull request #267 from isuruf/update

Update to latest symengine version and fix building

Author: bjodah

CMakeLists.txt

@@ -5,9 +5,11 @@ set(CMAKE_PREFIX_PATH ${SymEngine_DIR} ${CMAKE_PREFIX_PATH})
 find_package(SymEngine 0.3.0 REQUIRED CONFIG
              PATH_SUFFIXES lib/cmake/symengine cmake/symengine CMake/)
 message("SymEngine_DIR : " ${SymEngine_DIR})
+message("SymEngine Version : " ${SymEngine_VERSION})
 set(CMAKE_BUILD_TYPE ${SYMENGINE_BUILD_TYPE})
 set(CMAKE_CXX_FLAGS_RELEASE ${SYMENGINE_CXX_FLAGS_RELEASE})
 set(CMAKE_CXX_FLAGS_DEBUG ${SYMENGINE_CXX_FLAGS_DEBUG})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SYMENGINE_CXX_FLAGS}")
 include_directories(${SYMENGINE_INCLUDE_DIRS})
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
@@ -28,37 +30,14 @@ if (MINGW AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
     endif()
 endif()
 
-if(SYMENGINE_MPC_LIBRARIES)
-    set(HAVE_SYMENGINE_MPC True)
-else()
-    set(HAVE_SYMENGINE_MPC False)
-endif()
-
-if(SYMENGINE_MPFR_LIBRARIES)
-    set(HAVE_SYMENGINE_MPFR True)
-else()
-    set(HAVE_SYMENGINE_MPFR False)
-endif()
-
-if(SYMENGINE_PIRANHA_INCLUDE_DIRS)
-    set(HAVE_SYMENGINE_PIRANHA True)
-else()
-    set(HAVE_SYMENGINE_PIRANHA False)
-endif()
-
-if(SYMENGINE_FLINT_LIBRARIES)
-    set(HAVE_SYMENGINE_FLINT True)
-else()
-    set(HAVE_SYMENGINE_FLINT False)
-endif()
-
-if(SYMENGINE_LLVM_COMPONENTS)
-    set(HAVE_SYMENGINE_LLVM True)
-else()
-    set(HAVE_SYMENGINE_LLVM False)
-endif()
+foreach (PKG MPC MPFR PIRANHA FLINT LLVM)
+    if ("${HAVE_SYMENGINE_${PKG}}" STREQUAL "")
+        set(HAVE_SYMENGINE_${PKG} False)
+    endif()
+endforeach()
 
 message("CMAKE_BUILD_TYPE        : ${CMAKE_BUILD_TYPE}")
+message("CMAKE_CXX_FLAGS         : ${CMAKE_CXX_FLAGS}")
 message("CMAKE_CXX_FLAGS_RELEASE : ${CMAKE_CXX_FLAGS_RELEASE}")
 message("CMAKE_CXX_FLAGS_DEBUG   : ${CMAKE_CXX_FLAGS_DEBUG}")
 message("HAVE_SYMENGINE_MPFR     : ${HAVE_SYMENGINE_MPFR}")

symengine_version.txt

@@ -1 +1 @@
-f62f1931c9d0be28ac03938e3ec2ad33b286727d
+e66c30c60da65d4a0a058fd992c3c2f6b20be3d6