Skip to content

Commit cfe9445

Browse files
committed
Fixing prepare_externals.bat
1 parent e7386fc commit cfe9445

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

script/prepare_externals.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rem -----------------------------------------------------
1717

1818
if [%BUILD_DIR%] == [] echo "BUILD_DIR hasn't been specified" & exit /b 1
1919

20-
if [%GENERATOR%] == [] set GENERATOR="NMake Makefiles"
20+
if NOT [%GENERATOR%] == [] set GENERATOR_PARAM=-G %GENERATOR%
2121

2222
if NOT [%PLATFORM%] == [] set PLATFORM_PARAM=-A %PLATFORM%
2323

@@ -66,7 +66,7 @@ if exist %COMMS_SRC_DIR%/.git (
6666
echo "Building COMMS library..."
6767
mkdir "%COMMS_BUILD_DIR%"
6868
cd %COMMS_BUILD_DIR%
69-
cmake -G %GENERATOR% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%COMMS_INSTALL_DIR% ^
69+
cmake %GENERATOR_PARAM% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%COMMS_INSTALL_DIR% ^
7070
-DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% -DCMAKE_CXX_STANDARD=%COMMON_CXX_STANDARD%
7171
if %errorlevel% neq 0 exit /b %errorlevel%
7272
cmake --build %COMMS_BUILD_DIR% --config %COMMON_BUILD_TYPE% --target install
@@ -90,7 +90,7 @@ if exist %COMMSDSL_SRC_DIR%/.git (
9090
echo "Building commsdsl ..."
9191
mkdir "%COMMSDSL_BUILD_DIR%"
9292
cd %COMMSDSL_BUILD_DIR%
93-
cmake -G %GENERATOR% %COMMSDSL_PLATFORM_PARAM% -S %COMMSDSL_SRC_DIR% -B %COMMSDSL_BUILD_DIR% ^
93+
cmake %GENERATOR_PARAM% %COMMSDSL_PLATFORM_PARAM% -S %COMMSDSL_SRC_DIR% -B %COMMSDSL_BUILD_DIR% ^
9494
-DCMAKE_INSTALL_PREFIX=%COMMSDSL_INSTALL_DIR% -DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% ^
9595
-DCOMMSDSL_INSTALL_LIBRARY=OFF
9696
if %errorlevel% neq 0 exit /b %errorlevel%

0 commit comments

Comments
 (0)