@@ -109,7 +109,9 @@ install:
109109 - ren win-iconv-%WIN_ICONV_VER% iconv
110110 - mkdir iconv-build
111111 - cd iconv-build
112- - ' %WITH_COMPILER% cmake -G %GENERATOR% -DWIN_ICONV_BUILD_STATIC=on -DWIN_ICONV_BUILD_SHARED=off -DWIN_ICONV_BUILD_EXECUTABLE=off -DWIN_ICONV_BUILD_TEST=on -DDISABLE_LOCALE_CHARSET=on %GENERATE_RELEASE% ..\iconv'
112+ - >-
113+ %WITH_COMPILER% cmake -G %GENERATOR% -DWIN_ICONV_BUILD_STATIC=on -DWIN_ICONV_BUILD_SHARED=off
114+ -DWIN_ICONV_BUILD_EXECUTABLE=off -DWIN_ICONV_BUILD_TEST=on -DDISABLE_LOCALE_CHARSET=on %GENERATE_RELEASE% ..\iconv
113115 - ' %WITH_COMPILER% cmake --build . %CONFIG_OPT% %CONFIG_RELEASE:~2,-1%'
114116 - ' %CONFIG_RELEASE:~2%win_iconv_test.exe'
115117 - cd ..\iconv
@@ -132,14 +134,18 @@ build_script:
132134 - mkdir build
133135 - cd build
134136 - set DEST_DIR=vs%VS_VERSION%_%WIDTH%-%APPVEYOR_REPO_BRANCH%
135- - ' %WITH_COMPILER% cmake -G %GENERATOR% %GENERATE_RELEASE% -DENABLE_MSDBLIB=on -DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% ..'
137+ - >-
138+ %WITH_COMPILER% cmake -G %GENERATOR% %GENERATE_RELEASE% -DENABLE_MSDBLIB=on
139+ -DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% ..
136140 - ' %WITH_COMPILER% cmake --build . --verbose %CONFIG_OPT% %CONFIG_RELEASE:~2,-1%'
137141 - set PATH=%OPENSSL_ROOT_DIR%\bin;%PATH%
138142 - ' src\apps\%CONFIG_RELEASE:~2%tsql.exe -C'
139143 - cd ..
140144 - mkdir build_debug
141145 - cd build_debug
142- - ' %WITH_COMPILER% cmake -G %GENERATOR% %GENERATE_DEBUG% -DENABLE_EXTRA_CHECKS=on -DENABLE_MSDBLIB=on -DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% ..'
146+ - >-
147+ %WITH_COMPILER% cmake -G %GENERATOR% %GENERATE_DEBUG% -DENABLE_EXTRA_CHECKS=on -DENABLE_MSDBLIB=on
148+ -DCMAKE_INSTALL_PREFIX:PATH=%DEST_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% ..
143149 - ' %WITH_COMPILER% cmake --build . %CONFIG_OPT% %CONFIG_DEBUG:~2,-1%'
144150 - ' %WITH_COMPILER% cmake --build . %CONFIG_OPT% %CONFIG_DEBUG:~2,-1% --target build_tests'
145151 - ' src\apps\%CONFIG_DEBUG:~2%tsql.exe -C'
@@ -167,9 +173,13 @@ test_script:
167173 - set FREETDSCONF=%CD%\freetds.conf.local
168174 - set TDS_SKIP_SUCCESS=1
169175 # Add dirs of our just built DLLs to PATH envvar so everything works with older cmake
170- - ' if %VS_VERSION% lss 2019 set PATH=%CD%\src\ctlib%CONFIG_DEBUG:~1,-1%;%CD%\src\dblib%CONFIG_DEBUG:~1,-1%;%CD%\src\apps%CONFIG_DEBUG:~1,-1%;%PATH%'
176+ - >-
177+ if %VS_VERSION% lss 2019 set
178+ PATH=%CD%\src\ctlib%CONFIG_DEBUG:~1,-1%;%CD%\src\dblib%CONFIG_DEBUG:~1,-1%;%CD%\src\apps%CONFIG_DEBUG:~1,-1%;%PATH%
171179 # register ODBC driver
172- - ' %WINDIR%\SysWOW64\regsvr32 /s src\odbc\%CONFIG_DEBUG:~2%tdsodbc.dll || %WINDIR%\system32\regsvr32 /s src\odbc\%CONFIG_DEBUG:~2%tdsodbc.dll'
180+ - >-
181+ %WINDIR%\SysWOW64\regsvr32 /s src\odbc\%CONFIG_DEBUG:~2%tdsodbc.dll ||
182+ %WINDIR%\system32\regsvr32 /s src\odbc\%CONFIG_DEBUG:~2%tdsodbc.dll
173183 # Build and run tests
174184 - set CTEST_OUTPUT_ON_FAILURE=1
175185 - set DIAG_SILENT_ABORT=Y
0 commit comments