Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,
including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and I share. Now I need to put this branch on a fork with a less confusing name than vchoi_fork!
This commit is contained in:
7
config/cmake/CTestScript.cmake
Executable file → Normal file
7
config/cmake/CTestScript.cmake
Executable file → Normal file
@@ -72,7 +72,7 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
|
||||
if (CTEST_USE_TAR_SOURCE)
|
||||
## Uncompress source if tar or zip file provided
|
||||
## --------------------------
|
||||
if (WIN32)
|
||||
if (WIN32 AND NOT MINGW)
|
||||
message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
|
||||
execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
|
||||
else ()
|
||||
@@ -101,6 +101,11 @@ endif ()
|
||||
include (ProcessorCount)
|
||||
ProcessorCount (N)
|
||||
if (NOT N EQUAL 0)
|
||||
if (MAX_PROC_COUNT)
|
||||
if (N GREATER MAX_PROC_COUNT)
|
||||
set (N ${MAX_PROC_COUNT})
|
||||
endif ()
|
||||
endif ()
|
||||
if (NOT WIN32)
|
||||
set (CTEST_BUILD_FLAGS -j${N})
|
||||
endif ()
|
||||
|
||||
Reference in New Issue
Block a user