mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-25 21:40:33 +05:00
* Name the default installation folder based on the following pattern for both Netgen and Nglib:
- netgen-inst<NoOCC/OCC>_<Win32/x64> - nglib-inst<NoOCC/OCC>_<Win32/x64> * This change simplifies Visual C++ Batch Builds and Nullsoft Installer Scripts
This commit is contained in:
parent
00d8c320ff
commit
026ae6b625
@ -20,12 +20,17 @@ set LIB_NAME=%~6
|
|||||||
REM *** Change these Folders if required ***
|
REM *** Change these Folders if required ***
|
||||||
REM Check if the environment variable NETGENDIR exists,
|
REM Check if the environment variable NETGENDIR exists,
|
||||||
REM and use it as the installation folder
|
REM and use it as the installation folder
|
||||||
|
set W_WO_OCC=%BUILD_TYPE:~-4,3%
|
||||||
if defined NETGENDIR (
|
if defined NETGENDIR (
|
||||||
echo Environment variable NETGENDIR found: %NETGENDIR%
|
echo Environment variable NETGENDIR found: %NETGENDIR%
|
||||||
set INSTALL_FOLDER=%NETGENDIR%\..
|
set INSTALL_FOLDER=%NETGENDIR%\..
|
||||||
) else (
|
) else (
|
||||||
echo Environment variable NETGENDIR not found.... using default location!!!
|
echo Environment variable NETGENDIR not found.... using default location!!!
|
||||||
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst_%BUILD_ARCH%
|
if /i "%W_WO_OCC%" == "OCC" (
|
||||||
|
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instOCC_%BUILD_ARCH%
|
||||||
|
) else (
|
||||||
|
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instNoOCC_%BUILD_ARCH%
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
set NETGEN_TCLSRC=%PROJ_DIR%..\ng
|
set NETGEN_TCLSRC=%PROJ_DIR%..\ng
|
||||||
|
@ -19,12 +19,17 @@ set PROJ_DIR=%~5
|
|||||||
REM *** Change these Folders if required ***
|
REM *** Change these Folders if required ***
|
||||||
REM Check if the environment variable NETGENDIR exists,
|
REM Check if the environment variable NETGENDIR exists,
|
||||||
REM and use it as the installation folder
|
REM and use it as the installation folder
|
||||||
|
set W_WO_OCC=%BUILD_TYPE:~-4,3%
|
||||||
if defined NETGENDIR (
|
if defined NETGENDIR (
|
||||||
echo Environment variable NETGENDIR found: %NETGENDIR%
|
echo Environment variable NETGENDIR found: %NETGENDIR%
|
||||||
set INSTALL_FOLDER=%NETGENDIR%\..
|
set INSTALL_FOLDER=%NETGENDIR%\..
|
||||||
) else (
|
) else (
|
||||||
echo Environment variable NETGENDIR not found.... using default location!!!
|
echo Environment variable NETGENDIR not found.... using default location!!!
|
||||||
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-inst_%BUILD_ARCH%
|
if /i "%W_WO_OCC%" == "OCC" (
|
||||||
|
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instOCC_%BUILD_ARCH%
|
||||||
|
) else (
|
||||||
|
set INSTALL_FOLDER=%PROJ_DIR%..\..\%PROJ_NAME%-instNoOCC_%BUILD_ARCH%
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
set NGLIB_LIBINC=%PROJ_DIR%..\nglib
|
set NGLIB_LIBINC=%PROJ_DIR%..\nglib
|
||||||
|
Loading…
Reference in New Issue
Block a user