Merge branch 'muparserx_4_0_7' into develop

SuperBuild/CMake/External_muparserx.cmake

@@ -29,4 +29,4 @@ ExternalProject_Add(MUPARSERX
 #Patch mpParserMessageProvider.cpp. This patch is integrated upstream but not yet released (last release is 4.0.7)
 SUPERBUILD_PATCH_SOURCE(MUPARSERX)
 
-SUPERBUILD_UPDATE_CMAKE_VARIABLES(MUPARSERX FALSE)
+SUPERBUILD_UPDATE_CMAKE_VARIABLES(MUPARSERX FALSE muparserx muparserx)

SuperBuild/CMake/SuperBuild_Macro.cmake

@@ -148,16 +148,16 @@ endmacro(SUPERBUILD_PATCH_SOURCE)
 
 macro(SUPERBUILD_UPDATE_CMAKE_VARIABLES PROJECT with_prefix)
 
-  if("${ARGV3}" STREQUAL "")
+  if("${ARGV2}" STREQUAL "")
     string(TOLOWER ${PROJECT} lib_file_we)
   else()
-    set(lib_file_we "${ARGV3}")
+    set(lib_file_we "${ARGV2}")
   endif()
 
-  if("${ARGV4}" STREQUAL "")
+  if("${ARGV3}" STREQUAL "")
     set(include_dir "include")
   else()
-    set(include_dir "include/${ARGV4}")
+    set(include_dir "include/${ARGV3}")
   endif()
 
   if(WIN32)