Skip to content
Snippets Groups Projects
Commit 4cc899a0 authored by Lars Bilke's avatar Lars Bilke
Browse files

Static linking now works on Windows.

parent 989a3747
No related branches found
No related tags found
No related merge requests found
...@@ -67,7 +67,7 @@ IF(OGS_BUILD_GUI) ...@@ -67,7 +67,7 @@ IF(OGS_BUILD_GUI)
${VTK_LIBRARIES} ${VTK_LIBRARIES}
) )
ELSE() ELSE()
TARGET_LINK_LIBRARIES(testrunner vtkIO) TARGET_LINK_LIBRARIES(testrunner vtkIOXML)
ENDIF() ENDIF()
IF (QT4_FOUND) IF (QT4_FOUND)
......
...@@ -5,7 +5,8 @@ SET(CATALYST_GIT_URL https://github.com/ufz/catalyst-io.git) ...@@ -5,7 +5,8 @@ SET(CATALYST_GIT_URL https://github.com/ufz/catalyst-io.git)
FIND_PACKAGE(ParaView 4.2 COMPONENTS vtkIOXML QUIET) FIND_PACKAGE(ParaView 4.2 COMPONENTS vtkIOXML QUIET)
IF(ParaView_FOUND) FIND_LIBRARY(VTKIO_LIB_FOUND vtkIOXML-pv4.2 HINTS ${ParaView_DIR}/lib PATH_SUFFIXES Release Debug)
IF(ParaView_FOUND AND VTKIO_LIB_FOUND)
INCLUDE("${PARAVIEW_USE_FILE}") INCLUDE("${PARAVIEW_USE_FILE}")
# MESSAGE("Using Catalyst in ${ParaView_FOUND}") # MESSAGE("Using Catalyst in ${ParaView_FOUND}")
RETURN() RETURN()
...@@ -15,21 +16,22 @@ ENDIF() ...@@ -15,21 +16,22 @@ ENDIF()
SET(CATALYST_CMAKE_GENERATOR ${CMAKE_GENERATOR}) SET(CATALYST_CMAKE_GENERATOR ${CMAKE_GENERATOR})
IF(WIN32) IF(WIN32)
FIND_PROGRAM(NINJA_TOOL_PATH ninja DOC "Ninja build tool") # Ninja tempory disabled because it builds only the Release mode.
# FIND_PROGRAM(NINJA_TOOL_PATH ninja DOC "Ninja build tool")
IF(NINJA_TOOL_PATH) IF(NINJA_TOOL_PATH)
SET(CATALYST_CMAKE_GENERATOR Ninja) SET(CATALYST_CMAKE_GENERATOR Ninja)
SET(CATALYST_MAKE_COMMAND ninja vtkIO) SET(CATALYST_MAKE_COMMAND ninja vtkIOXML)
ELSE() ELSE()
SET(CATALYST_MAKE_COMMAND SET(CATALYST_MAKE_COMMAND
cmake --build . --config Release --target vtkIO -- /m && cmake --build . --config Release --target vtkIOXML -- /m &&
cmake --build . --config Debug --target vtkIO -- /m) cmake --build . --config Debug --target vtkIOXML -- /m)
ENDIF() ENDIF()
SET(CATALYST_CONFIGURE_COMMAND cmake.bat) SET(CATALYST_CONFIGURE_COMMAND cmake.bat)
ELSE() ELSE()
IF($ENV{CI}) IF($ENV{CI})
SET(CATALYST_MAKE_COMMAND make vtkIO) SET(CATALYST_MAKE_COMMAND make vtkIOXML)
ELSE() ELSE()
SET(CATALYST_MAKE_COMMAND make -j ${NUM_PROCESSORS} vtkIO) SET(CATALYST_MAKE_COMMAND make -j ${NUM_PROCESSORS} vtkIOXML)
ENDIF() ENDIF()
SET(CATALYST_CONFIGURE_COMMAND cmake.sh) SET(CATALYST_CONFIGURE_COMMAND cmake.sh)
ENDIF() ENDIF()
...@@ -50,3 +52,4 @@ IF(NOT ${ParaView_FOUND}) ...@@ -50,3 +52,4 @@ IF(NOT ${ParaView_FOUND})
ELSE() ELSE()
ADD_CUSTOM_TARGET(VtkRescan) # dummy target for caching ADD_CUSTOM_TARGET(VtkRescan) # dummy target for caching
ENDIF() ENDIF()
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment