OCT-5087 Fix expat integration for linux gcc

1. Not passing all FMIL C-flags to expat. We're using C89 and they C99,
   which prevented compilation. We should regardless let expat set their
   flags internal flags and not override them with ours.
2. XML_STATIC is only exposed in the public header for expat. So only
   needs to be set when we're compiling any library that users that
   header, i.e. fmixml. Not when compiling expat.
3. Removed FMI_XML_QUERY because it seems unused.

Author: filip-stenstrom

Config.cmake/fmixml.cmake

@@ -137,8 +137,6 @@ set(FMIXMLSOURCE
 	src/FMI2/fmi2_xml_variable.c
 )
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXML_STATIC -DFMI_XML_QUERY")
-
 include(ExternalProject)
 
 # The *_POSTFIX variables are set because it makes it easier to determine the name of
@@ -155,12 +153,8 @@ set(EXPAT_SETTINGS
     -DCMAKE_RELEASE_POSTFIX:STRING=
     -DCMAKE_MINSIZEREL_POSTFIX:STRING=
     -DCMAKE_RELWITHDEBINFO_POSTFIX:STRING=
+    -DCMAKE_POSITION_INDEPENDENT_CODE:BOOLEAN=ON
     -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-    -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
-    -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
-    -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
-    -DCMAKE_C_FLAGS_MINSIZEREL:STRING=${CMAKE_C_FLAGS_MINSIZEREL}
-    -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO}
     -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
     -DCMAKE_LINK_LIBRARY_FLAG:STRING=${CMAKE_LINK_LIBRARY_FLAG}
     -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS}
@@ -192,7 +186,7 @@ ExternalProject_Add_Step(
 add_dependencies(expatex ${CMAKE_BINARY_DIR}/CMakeCache.txt ${FMILIBRARYHOME}/CMakeLists.txt)
 
 
-if(WIN32 AND NOT MINGW)
+if(MSVC)
     # Expat uses special naming with MSVC, which is mirrored here.
     set(EXPAT_LIB_PREFIX lib)
 else()
@@ -233,6 +227,9 @@ list(APPEND FMIXMLSOURCE
 debug_message(STATUS "adding fmixml")
 
 add_library(fmixml ${FMILIBKIND} ${FMIXMLSOURCE} ${FMIXMLHEADERS})
+if(MSVC)
+    target_compile_definitions(fmixml XML_STATIC)
+endif()
 
 target_link_libraries(fmixml ${JMUTIL_LIBRARIES} expat)
 

build/config/win64_static_runtime

@@ -4,7 +4,7 @@ CONFIG=win64_static_runtime
 SRC_DIR=.
 BUILD_DIR=build-$(CONFIG)
 INSTALL_DIR=install-$(CONFIG)
-GENERATOR="Visual Studio 15 2017 win64"
+GENERATOR="Visual Studio 15 2017 Win64"
 FMILIB_CMAKE_CUSTOM_FLAGS=-DCMAKE_C_FLAGS= # N/A
 
 # FMILIB_...