Revision: 77219
http://sourceforge.net/p/brlcad/code/77219
Author: starseeker
Date: 2020-09-25 01:10:32 +0000 (Fri, 25 Sep 2020)
Log Message:
-----------
Switch MSVC back to a Ninja build.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/github_ci_actions.yml
Modified: brlcad/trunk/misc/repoconv/github_ci_actions.yml
===================================================================
--- brlcad/trunk/misc/repoconv/github_ci_actions.yml 2020-09-24 21:20:54 UTC
(rev 77218)
+++ brlcad/trunk/misc/repoconv/github_ci_actions.yml 2020-09-25 01:10:32 UTC
(rev 77219)
@@ -112,10 +112,10 @@
endif()
set(ENV{PATH} "$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}")
- if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{
matrix.config.environment_script }}" STREQUAL "x")
execute_process(
COMMAND cmake
-S .
+ -G Ninja
-B build
-D ENABLE_ALL=ON
-D CMAKE_BUILD_TYPE=Release
@@ -126,26 +126,13 @@
-D BUILD_STATIC_LIBS=OFF
RESULT_VARIABLE result
)
- # Try Write-VolumeCache for Windows
- execute_process(COMMAND powershell Write-VolumeCache C)
- execute_process(COMMAND powershell Write-VolumeCache D)
+ if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{
matrix.config.environment_script }}" STREQUAL "x")
+ # Try Write-VolumeCache for Windows
+ execute_process(COMMAND powershell Write-VolumeCache C)
+ execute_process(COMMAND powershell Write-VolumeCache D)
else()
- execute_process(
- COMMAND cmake
- -S .
- -G Ninja
- -B build
- -D ENABLE_ALL=ON
- -D CMAKE_BUILD_TYPE=Release
- -D CMAKE_VERBOSE_DISTCHECK=ON
- -D BRLCAD_ENABLE_GDAL=OFF
- -D BRLCAD_ENABLE_STEP=OFF
- -D BRLCAD_EXTRADOCS=OFF
- -D BUILD_STATIC_LIBS=OFF
- RESULT_VARIABLE result
- )
- # On platforms where we have it, make sure the files are in place with
a sync
- execute_process(COMMAND sync)
+ # On platforms where we have it, make sure the files are in place
with a sync
+ execute_process(COMMAND sync)
endif()
if (NOT result EQUAL 0)
message(FATAL_ERROR "Bad exit status")
@@ -182,7 +169,7 @@
set(BCNT 0)
set(result 1)
while(result AND ${BCNT} LESS 4)
- execute_process(COMMAND cmake --build build --config Release
--target ALL_BUILD RESULT_VARIABLE result)
+ execute_process(COMMAND cmake --build build --config Release
--target all RESULT_VARIABLE result)
if (NOT ${result})
execute_process(COMMAND powershell Write-VolumeCache C)
execute_process(COMMAND powershell Write-VolumeCache D)
@@ -191,7 +178,7 @@
if (NOT ${result})
execute_process(COMMAND powershell Write-VolumeCache C)
execute_process(COMMAND powershell Write-VolumeCache D)
- execute_process(COMMAND cmake --build build --config Release
--target PACKAGE RESULT_VARIABLE result)
+ execute_process(COMMAND cmake --build build --config Release
--target package RESULT_VARIABLE result)
endif()
math(EXPR BCNT "${BCNT}+1")
endwhile()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
