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

Added ninja support on Windows.

parent b6c4b7b6
No related branches found
No related tags found
No related merge requests found
...@@ -13,12 +13,18 @@ ELSE() ...@@ -13,12 +13,18 @@ ELSE()
SET(ParaView_DIR ${CMAKE_BINARY_DIR}/External/catalyst/src/Catalyst-build CACHE PATH "" FORCE) SET(ParaView_DIR ${CMAKE_BINARY_DIR}/External/catalyst/src/Catalyst-build CACHE PATH "" FORCE)
ENDIF() ENDIF()
SET(CATALYST_CMAKE_GENERATOR ${CMAKE_GENERATOR})
IF(WIN32) IF(WIN32)
SET(CATALYST_MAKE_COMMAND FIND_PROGRAM(NINJA_TOOL_PATH ninja DOC "Ninja build tool")
cmake --build . --config Release --target vtkIO && IF(NINJA_TOOL_PATH)
cmake --build . --config Debug --target vtkIO) SET(CATALYST_CMAKE_GENERATOR Ninja)
SET(CATALYST_MAKE_COMMAND ninja vtkIO)
ELSE()
SET(CATALYST_MAKE_COMMAND
cmake --build . --config Release --target vtkIO -- /m &&
cmake --build . --config Debug --target vtkIO -- /m)
ENDIF()
SET(CATALYST_CONFIGURE_COMMAND cmake.bat) SET(CATALYST_CONFIGURE_COMMAND cmake.bat)
# MESSAGE(STATUS ${CATALYST_MAKE_COMMAND})
ELSE() ELSE()
IF($ENV{CI}) IF($ENV{CI})
SET(CATALYST_MAKE_COMMAND make vtkIO) SET(CATALYST_MAKE_COMMAND make vtkIO)
...@@ -33,7 +39,7 @@ ExternalProject_Add(Catalyst ...@@ -33,7 +39,7 @@ ExternalProject_Add(Catalyst
GIT_REPOSITORY ${CATALYST_GIT_URL} GIT_REPOSITORY ${CATALYST_GIT_URL}
#URL ${OGS_VTK_URL} #URL ${OGS_VTK_URL}
#URL_MD5 ${OGS_VTK_MD5} #URL_MD5 ${OGS_VTK_MD5}
CONFIGURE_COMMAND ../Catalyst/${CATALYST_CONFIGURE_COMMAND} ../Catalyst CONFIGURE_COMMAND ../Catalyst/${CATALYST_CONFIGURE_COMMAND} -G ${CATALYST_CMAKE_GENERATOR} ../Catalyst
BUILD_COMMAND ${CATALYST_MAKE_COMMAND} BUILD_COMMAND ${CATALYST_MAKE_COMMAND}
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
......
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