appveyor fix 5: cmake common args

diff --git a/CI-testing/continuous-integration-testing.pl b/CI-testing/continuous-integration-testing.pl
index 7a3ed7fff8a4195a6126b189f3422cc1b0a0d25d..29d803d7c7208a87c22d4fa571535d48bdf17f5f 100644 (file)
--- a/CI-testing/continuous-integration-testing.pl
+++ b/CI-testing/continuous-integration-testing.pl
@@ -43,6 +43,15 @@ sub _transform
 }
 mkdir('B');
 chdir('B');
+
+my $cmake_common_args = ""
+    . ( defined($cmake_gen) ? qq# -G "$cmake_gen" # : "" )
+    . (
+    defined( $ENV{CMAKE_MAKE_PROGRAM} )
+    ? " -DCMAKE_MAKE_PROGRAM=$ENV{CMAKE_MAKE_PROGRAM} "
+    : ""
+    );
+
 if ( !$ENV{SKIP_RINUTILS_INSTALL} )
 {
     do_system(
@@ -54,13 +63,8 @@ if ( !$ENV{SKIP_RINUTILS_INSTALL} )
         {
             cmd => [
                       qq#cd rinutils && mkdir B && cd B && cmake #
+                    . $cmake_common_args
                     . " -DWITH_TEST_SUITE=OFF "
-                    . ( defined($cmake_gen) ? qq# -G "$cmake_gen" # : "" )
-                    . (
-                    defined( $ENV{CMAKE_MAKE_PROGRAM} )
-                    ? " -DCMAKE_MAKE_PROGRAM=$ENV{CMAKE_MAKE_PROGRAM} "
-                    : ""
-                    )
                     . ( $IS_WIN ? " -DCMAKE_INSTALL_PREFIX=C:/foo " : '' )
                     . qq# .. && $SUDO $MAKE install#
             ]
@@ -95,7 +99,7 @@ do_system(
                 : ''
                 )
                 . " "
-                . ( defined($cmake_gen) ? qq#-G "$cmake_gen"# : "" )
+                . $cmake_common_args
                 . " ../fortune-mod && $MAKE && $MAKE check"
         ]
     }