OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0026942: Training material are not built on OCCT installed after building by cmake procedure

Browse Source 
Environment variable QT_DIR was renamed to QTDIR.
This commit is contained in:
ski 2015-12-09 11:55:05 +03:00 committed by bugmaster
parent 8c31bd38a1
commit e085d8a60e
12 changed files with 24 additions and 24 deletions

4
samples/qt/IESample/IESample.pro

@ -61,13 +61,13 @@ win32 {
DESTDIR = ./win$(ARCH)/$(VCVER)/bind
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
} else {
DEFINES += NDEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bin
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
}
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
}

4
samples/qt/IESample/custom.bat

@ -1,4 +1,4 @@
@echo off
rem Define QT_DIR variables in order to load OCCT environment
rem Define QTDIR variable
set "QT_DIR="
set "QTDIR="

4
samples/qt/IESample/custom.sh

@ -1,4 +1,4 @@
#!/bin/bash
#Define QT_DIR variables in order to generate Makefile files by qmake
#Define QTDIR variable
export QT_DIR=""
export QTDIR=""

4
samples/qt/IESample/env.bat

@ -8,5 +8,5 @@ set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
set "CSF_ResourcesDefaults=%RES_DIR%"
set "CSF_IEResourcesDefaults=%RES_DIR%"
set "PATH=%QT_DIR%/bin;%PATH%"
set "QT_QPA_PLATFORM_PLUGIN_PATH=%QT_DIR%\plugins\platforms"
set "PATH=%QTDIR%/bin;%PATH%"
set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"

6
samples/qt/IESample/env.sh

@ -10,8 +10,8 @@ if [ -e "${aSamplePath}/../../../env.sh" ]; then
source "${aSamplePath}/../../../env.sh";
fi
if test "${QT_DIR}" == ""; then
echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script."
if test "${QTDIR}" == ""; then
echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
exit 1
fi
@ -19,4 +19,4 @@ host=`uname -s`
export STATION=$host
export RES_DIR=${aSamplePath}/${STATION}/res
export PATH=${QT_DIR}/bin:${PATH}
export PATH=${QTDIR}/bin:${PATH}

2
samples/qt/IESample/genproj.bat

@ -1,6 +1,6 @@
@echo off
REM Generation of vcproj files with qmake utilite
REM Variable QT_DIR and PATH to qmake executable must be defined without fail
REM Variable QTDIR and PATH to qmake executable must be defined without fail
REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
REM second argument specifies architecture) (win32 or win64)

4
samples/qt/Tutorial/Tutorial.pro

@ -64,13 +64,13 @@ win32 {
DESTDIR = ./win$(ARCH)/$(VCVER)/bind
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
} else {
DEFINES += NDEBUG
DESTDIR = ./win$(ARCH)/$(VCVER)/bin
OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
}
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
}

4
samples/qt/Tutorial/custom.bat

@ -1,4 +1,4 @@
@echo off
rem Define QT_DIR variables in order to load OCCT environment
rem Define QTDIR variable
set "QT_DIR="
set "QTDIR="

4
samples/qt/Tutorial/custom.sh

@ -1,4 +1,4 @@
#!/bin/bash
#Define QT_DIR variables in order to generate Makefile files by qmake
#Define QTDIR variable
export QT_DIR=""
export QTDIR=""

4
samples/qt/Tutorial/env.bat

@ -8,5 +8,5 @@ set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
set "CSF_ResourcesDefaults=%RES_DIR%"
set "CSF_TutorialResourcesDefaults=%RES_DIR%"
set "PATH=%QT_DIR%/bin;%PATH%"
set "QT_QPA_PLATFORM_PLUGIN_PATH=%QT_DIR%\plugins\platforms"
set "PATH=%QTDIR%/bin;%PATH%"
set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"

6
samples/qt/Tutorial/env.sh

@ -10,8 +10,8 @@ if [ -e "${aSamplePath}/../../../env.sh" ]; then
source "${aSamplePath}/../../../env.sh";
fi
if test "${QT_DIR}" == ""; then
echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script."
if test "${QTDIR}" == ""; then
echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
exit 1
fi
@ -19,4 +19,4 @@ host=`uname -s`
export STATION=$host
export RES_DIR=${aSamplePath}/${STATION}/res
export PATH=${QT_DIR}/bin:${PATH}
export PATH=${QTDIR}/bin:${PATH}

2
samples/qt/Tutorial/genproj.bat

@ -1,6 +1,6 @@
@echo off
REM Generation of vcproj files with qmake utilite
REM Variable QT_DIR and PATH to qmake executable must be defined without fail
REM Variable QTDIR and PATH to qmake executable must be defined without fail
REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
REM second argument specifies architecture) (win32 or win64)