Skip to content

Commit

Permalink
Bump to exprtk submodule to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed Nov 27, 2017
1 parent a96771b commit 5e2b85e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
6 changes: 0 additions & 6 deletions plugins/Xpressive/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_io_file")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_vecops")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAGS} -fexceptions")

# See https://github.com/ArashPartow/exprtk/pull/9
IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
EXECUTE_PROCESS(COMMAND patch exprtk/exprtk.hpp exprtk.hpp.patch
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET)
ENDIF()

IF(LMMS_BUILD_WIN32 AND NOT MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
ENDIF()
Expand Down
2 changes: 1 addition & 1 deletion plugins/Xpressive/exprtk
Submodule exprtk updated 1 files
+278 −234 exprtk.hpp
13 changes: 0 additions & 13 deletions plugins/Xpressive/exprtk.hpp.patch

This file was deleted.

0 comments on commit 5e2b85e

Please sign in to comment.