Skip to content

Commit 9c6ae61

Browse files
committed
Updating ctest script for nmake
1 parent 299a204 commit 9c6ae61

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
g

cmake/ctest_script.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ SET( CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 10000 )
135135
SET( CTEST_COMMAND "\"${CTEST_EXECUTABLE_NAME}\" -D ${CTEST_DASHBOARD}" )
136136
IF ( BUILD_SERIAL )
137137
SET( CTEST_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM} -i install" )
138+
ELSEIF ( "${CMAKE_MAKE_PROGRAM}" STREQUAL "nmake" )
139+
SET( CTEST_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM} -i install" )
138140
ELSE()
139141
SET( CTEST_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM} -i -j ${N_PROCS} install" )
140142
ENDIF()
@@ -208,7 +210,7 @@ ENDIF()
208210
IF ( NOT CTEST_URL )
209211
MESSAGE( FATAL_ERROR "CTEST_URL is not set" )
210212
ENDIF()
211-
STRING( REPLACE "PROJECT" "AMR-MHD" CTEST_URL "${CTEST_URL}" )
213+
STRING( REPLACE "PROJECT" "StackTrace" CTEST_URL "${CTEST_URL}" )
212214
SET( CTEST_SUBMIT_URL "${CTEST_URL}" )
213215

214216

@@ -217,13 +219,15 @@ IF ( NOT CTEST_GIT_COMMAND )
217219
SET( CTEST_GIT_COMMAND "$ENV{CTEST_GIT_COMMAND}" )
218220
ENDIF()
219221
IF ( NOT CTEST_GIT_COMMAND )
220-
FIND_PROGRAM( CTEST_GIT_COMMAND "git" )
222+
FIND_PROGRAM( CTEST_GIT_COMMAND git )
221223
ENDIF()
222224
IF ( NOT CTEST_GIT_COMMAND )
223225
SET( CTEST_GIT_COMMAND git )
224226
ENDIF()
225227
SET( CTEST_UPDATE_COMMAND ${CTEST_GIT_COMMAND} )
226228
SET( CTEST_UPDATE_OPTIONS )
229+
MESSAGE( "CTEST_UPDATE_COMMAND=${CTEST_UPDATE_COMMAND}" )
230+
MESSAGE( "CTEST_UPDATE_OPTIONS=${CTEST_UPDATE_OPTIONS}" )
227231

228232

229233
# Configure and run the tests

0 commit comments

Comments
 (0)