...
 
Commits (4)
......@@ -184,7 +184,7 @@ int main(int argc, char** argv)
strcmp(argv[i], "--mesa-swr") == 0 ||
strcmp(argv[i], "--mesa") == 0)
{
snprintf(driver_choice, MAX_DRIVER_CHOICE, argv[i] + 2);
snprintf(driver_choice, MAX_DRIVER_CHOICE, "%s", argv[i] + 2);
}
else
{
......
......@@ -5,7 +5,7 @@ if (NOT ParaView_BINARY_DIR)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
find_package(Gmsh 3.0.7 REQUIRED)
find_package(Gmsh 4.0.0 REQUIRED)
include_directories(
${VTK_INCLUDE_DIRS}
......
......@@ -29,11 +29,11 @@ if(Gmsh_INCLUDE_DIR)
set(VersionFile GmshVersion.h)
if(EXISTS ${Gmsh_INCLUDE_DIR}/${VersionFile})
file(READ ${Gmsh_INCLUDE_DIR}/GmshVersion.h GMSH_VERSION_FILE)
string(REGEX MATCH "\#define GMSH_VERSION *\"([0-9,.]*)\"" GMSH_VERSION_STRING ${GMSH_VERSION_FILE})
string(REGEX MATCH "\#define GMSH_VERSION *\"([0-9,.]*).*\"" GMSH_VERSION_STRING ${GMSH_VERSION_FILE})
set(Gmsh_VERSION ${CMAKE_MATCH_1} CACHE INTERNAL "Gmsh Version")
else()
message(SEND_ERROR "Could not find " ${VersionFile} " in " ${Gmsh_INCLUDE_DIR}
". Check path or reconfigure Gmsh with -DENABLE_INTERNAL_DEVELOPER_API=ON")
". Check path or reconfigure Gmsh with -DENABLE_PRIVATE_API=ON")
endif()
if(Gmsh_LIBRARY)
set(Gmsh_LIBRARIES ${Gmsh_LIBRARY})
......
......@@ -18,6 +18,7 @@
#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#endif
// Gmsh headers
......