Skip to content

Commit

Permalink
Support building with QuickFAST cleanly
Browse files Browse the repository at this point in the history
  • Loading branch information
Dale Wilson committed Nov 30, 2016
1 parent c2a50a6 commit 38fa592
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 2 deletions.
2 changes: 2 additions & 0 deletions liquibook.mwc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ workspace(liquibook) {
cmdline += -include mpc
cmdline += -include $QUICKFAST_ROOT
cmdline += -feature_file liquibook.features
cmdline += -expand_vars
cmdline += -use_env
}

2 changes: 1 addition & 1 deletion mpc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
@REM Note: -expand_vars -use_env options force MPC to expand $(BOOST_ROOT) into the absolute path. This avoids
@REM a problem that happened when people were starting Visual Studio from the Start menu rather than
@REM from the command line where the BOOST_ROOT environment had been defined.
"%MPC_ROOT%\mwc.pl" -expand_vars -use_env -type vc%VCVER% liquibook.mwc
"%MPC_ROOT%\mwc.pl" -type vc%VCVER% liquibook.mwc
3 changes: 3 additions & 0 deletions noQuickFAST/QuickFASTApplication.mpb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
project{
requires += QuickFAST
}
7 changes: 6 additions & 1 deletion winenv.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ REM EDIT THE FOLLOWING LINES OR SET THESE VALUES IN YOUR ENVIRONMENT BEFORE RUNN
if "a" == "a%MPC_ROOT%" set MPC_ROOT=c:\MPC\MPC
if "a" == "a%BOOST_VERSION%" set BOOST_VERSION=boost_1_61_0
if "a" == "a%BOOST_ROOT%" set BOOST_ROOT=c:\boost\%BOOST_VERSION%
@REM TODO: For the example program set QUICKFAST_ROOT *
if "a" == "a%QUICKFAST_ROOT%" set QUICKFAST_ROOT=noQuickFAST
@REM TODO: For the example program set QUICKFAST_ROOT to the actual quickfast directory and
@REM TODO: Edit the features file.
REM END OF VALUES TO BE SET
REM =====================================================================================

Expand All @@ -42,6 +44,9 @@ if not exist "%BOOST_ROOT%\boost" goto setup_is_bad
set SETUP_CHECKING=BOOST_ROOT lib=%BOOST_ROOT%\lib
if not exist "%BOOST_ROOT%\lib" goto setup_is_bad

set SETUP_CHECKING=QUICKFAST_ROOT contains QuickFASTApplication.mpb
if not exist %QUICKFAST_ROOT%\QuickFASTApplication.mpb goto setup_is_bad

REM Find visual studio.
REM You can short-circuit this by setting VCVER before running this
REM However this also avoids the check to see if VC is installed in the expected place.
Expand Down
1 change: 1 addition & 0 deletions winenv_clear.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ set XERCESROOT=
set XERCES_LIBNAME=
set BOOST_VERSION=
set BOOST_ROOT=
set QUICKFAST_ROOT=

0 comments on commit 38fa592

Please sign in to comment.