From 980d161f0320d02c5ed7e30c9dbd00b862199691 Mon Sep 17 00:00:00 2001 From: ski Date: Tue, 6 Oct 2015 14:14:36 +0300 Subject: [PATCH] 0026739: Problem with generate Qt samples Generation of project files was fixed. --- samples/qt/Common/src/View.cxx | 1 - samples/qt/IESample/IESample.pro | 51 ++++++++++++-------------------- samples/qt/IESample/custom.bat | 4 +++ samples/qt/IESample/custom.sh | 12 ++------ samples/qt/IESample/env.bat | 13 +++++--- samples/qt/IESample/env.sh | 23 ++++++-------- samples/qt/IESample/genproj.bat | 3 +- samples/qt/IESample/make.sh | 2 +- samples/qt/IESample/run.bat | 3 +- samples/qt/IESample/run.sh | 3 +- samples/qt/Tutorial/Tutorial.pro | 51 ++++++++++++-------------------- samples/qt/Tutorial/custom.bat | 4 +++ samples/qt/Tutorial/custom.sh | 12 ++------ samples/qt/Tutorial/env.bat | 13 +++++--- samples/qt/Tutorial/env.sh | 23 ++++++-------- samples/qt/Tutorial/genproj.bat | 3 +- samples/qt/Tutorial/make.sh | 2 +- samples/qt/Tutorial/run.sh | 3 +- 18 files changed, 99 insertions(+), 127 deletions(-) create mode 100644 samples/qt/IESample/custom.bat create mode 100644 samples/qt/Tutorial/custom.bat diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx index 929a6c0a7b..4eca6970c4 100755 --- a/samples/qt/Common/src/View.cxx +++ b/samples/qt/Common/src/View.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro index e2faac4a49..433524fab5 100755 --- a/samples/qt/IESample/IESample.pro +++ b/samples/qt/IESample/IESample.pro @@ -3,7 +3,7 @@ CONFIG += debug_and_release qt TARGET = IESample -SAMPLESROOT = $$(SAMPLESROOT) +SAMPLESROOT = $$quote($$(CASROOT)/samples/qt) HEADERS = $${SAMPLESROOT}/Common/src/*.h \ $${SAMPLESROOT}/Interface/src/*.h @@ -22,6 +22,7 @@ RES_DIR = $$quote($$(RES_DIR)) INCLUDEPATH += $$quote($${SAMPLESROOT}/Common/src) INCLUDEPATH += $$quote($${SAMPLESROOT}/Interface/src) +INCLUDEPATH += $$quote($$(CASROOT)/inc) OCCT_DEFINES = $$(CSF_DEFINES) @@ -29,21 +30,18 @@ DEFINES = $$split(OCCT_DEFINES, ;) unix { UNAME = $$system(uname -s) - INCLUDES = $$(CSF_OPT_INC) - PATHS = $$split(INCLUDES,":") - for(path, PATHS):INCLUDEPATH += $${path} LIBLIST = $$(LD_LIBRARY_PATH) LIBPATHS = $$split(LIBLIST,":") for(lib, LIBPATHS):LIBS += -L$${lib} CONFIG(debug, debug|release) { - DESTDIR = ./$$UNAME/bind - OBJECTS_DIR = ./$$UNAME/objd - MOC_DIR = ./$$UNAME/mocd + DESTDIR = ./$$UNAME/bind + OBJECTS_DIR = ./$$UNAME/objd + MOC_DIR = ./$$UNAME/mocd } else { - DESTDIR = ./$$UNAME/bin - OBJECTS_DIR = ./$$UNAME/obj - MOC_DIR = ./$$UNAME/moc + DESTDIR = ./$$UNAME/bin + OBJECTS_DIR = ./$$UNAME/obj + MOC_DIR = ./$$UNAME/moc } MACOSX_USE_GLX = $$(MACOSX_USE_GLX) @@ -55,33 +53,22 @@ unix { !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD LIBS += -lfreeimageplus LIBS += -ltbb -ltbbmalloc + QMAKE_CXXFLAGS += -std=gnu++11 } win32 { - INCLUDES = $$(CSF_OPT_INC) - PATHS = $$split(INCLUDES,";") - for(path, PATHS):INCLUDEPATH += $${path} - CONFIG(debug, debug|release) { - DEFINES += _DEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bind - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd - MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd - !contains(QMAKE_HOST.arch, x86_64) { - LIBS = -L$(CSF_OPT_LIB32D) - } else { - LIBS = -L$(CSF_OPT_LIB64D) - } + DEFINES += _DEBUG + 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 } else { - DEFINES += NDEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bin - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj - MOC_DIR = ./win$(ARCH)/$(VCVER)/moc - !contains(QMAKE_HOST.arch, x86_64) { - LIBS = -L$(CSF_OPT_LIB32) - } else { - LIBS = -L$(CSF_OPT_LIB64) - } + 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 } DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS } diff --git a/samples/qt/IESample/custom.bat b/samples/qt/IESample/custom.bat new file mode 100644 index 0000000000..4597f54feb --- /dev/null +++ b/samples/qt/IESample/custom.bat @@ -0,0 +1,4 @@ +@echo off +rem Define QT_DIR variables in order to load OCCT environment + +set "QT_DIR=" diff --git a/samples/qt/IESample/custom.sh b/samples/qt/IESample/custom.sh index 7442d2290f..9a6500928e 100755 --- a/samples/qt/IESample/custom.sh +++ b/samples/qt/IESample/custom.sh @@ -1,10 +1,4 @@ -#!/bin/sh +#!/bin/bash +#Define QT_DIR variables in order to generate Makefile files by qmake -#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake. -#If you are using Mac OS X it is necessary to define WOKHOME as a path to your WOK installation directory. - -export CASROOT="" - -export QTDIR="" - -export WOKHOME="" +export QT_DIR="" diff --git a/samples/qt/IESample/env.bat b/samples/qt/IESample/env.bat index 3e498065a9..6d50198a83 100755 --- a/samples/qt/IESample/env.bat +++ b/samples/qt/IESample/env.bat @@ -1,6 +1,11 @@ +@echo off + +call "custom.bat" %1 %2 %3 + call "%~dp0..\..\..\env.bat" %1 %2 %3 -SET "SAMPLESROOT=%~dp0.." -SET "RES_DIR=%~dp0win%ARCH%\%VCVER%\res" -SET "CSF_ResourcesDefaults=%RES_DIR%" -SET "CSF_IEResourcesDefaults=%RES_DIR%" +set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res" +set "CSF_ResourcesDefaults=%RES_DIR%" +set "CSF_IEResourcesDefaults=%RES_DIR%" + +set "PATH=%QT_DIR%/bin;%PATH%" diff --git a/samples/qt/IESample/env.sh b/samples/qt/IESample/env.sh index dcc2990425..e26767091f 100755 --- a/samples/qt/IESample/env.sh +++ b/samples/qt/IESample/env.sh @@ -1,19 +1,17 @@ -#!/bin/sh +#!/bin/bash -if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi +export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -if test "${CASROOT}" == ""; then - echo "Environment variable \"CASROOT\" not defined. Define it in \"custom.sh\" script." - exit 1 +if [ -e "custom.sh" ]; then + source "custom.sh"; fi -if test "${QTDIR}" == ""; then - echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script." - exit 1 +if [ -e "${aSamplePath}/../../../env.sh" ]; then + source "${aSamplePath}/../../../env.sh"; fi -if test `uname -s` == "Darwin" && test "${WOKHOME}" == ""; then - echo "Environment variable \"WOKHOME\" not defined. Define it in \"custom.sh\" script." +if test "${QT_DIR}" == ""; then + echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script." exit 1 fi @@ -21,7 +19,4 @@ host=`uname -s` export STATION=$host export RES_DIR=${aSamplePath}/${STATION}/res -export PATH=${QTDIR}/bin:${PATH} - -source $CASROOT/env.sh -export CSF_OPT_INC="${CASROOT}/inc:${WOKHOME}/lib:${CSF_OPT_INC}" +export PATH=${QT_DIR}/bin:${PATH} diff --git a/samples/qt/IESample/genproj.bat b/samples/qt/IESample/genproj.bat index 8ac891a16e..b65650fe27 100644 --- a/samples/qt/IESample/genproj.bat +++ b/samples/qt/IESample/genproj.bat @@ -1,5 +1,6 @@ +@echo off REM Generation of vcproj files with qmake utilite -REM Variable QTDIR and PATH to qmake executable must be defined without fail +REM Variable QT_DIR 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) diff --git a/samples/qt/IESample/make.sh b/samples/qt/IESample/make.sh index 4e56b6c4f9..ef84e31e77 100755 --- a/samples/qt/IESample/make.sh +++ b/samples/qt/IESample/make.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi diff --git a/samples/qt/IESample/run.bat b/samples/qt/IESample/run.bat index 0c1b69fd26..9117b5ea03 100644 --- a/samples/qt/IESample/run.bat +++ b/samples/qt/IESample/run.bat @@ -1,8 +1,7 @@ call "%~dp0env.bat" %1 %2 %3 set "BIN_DIR=win%ARCH%\%VCVER%\bind" - -IF ["%CASDEB%"] == [""] ( +if ["%CASDEB%"] == [""] ( set "BIN_DIR=win%ARCH%\%VCVER%\bin" ) diff --git a/samples/qt/IESample/run.sh b/samples/qt/IESample/run.sh index d9d8d2acef..a9374a3133 100755 --- a/samples/qt/IESample/run.sh +++ b/samples/qt/IESample/run.sh @@ -1,6 +1,7 @@ -#!/bin/sh +#!/bin/bash export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi cd $aSamplePath diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro index 2dfd90e012..dd66bb4881 100755 --- a/samples/qt/Tutorial/Tutorial.pro +++ b/samples/qt/Tutorial/Tutorial.pro @@ -3,7 +3,7 @@ CONFIG += debug_and_release qt TARGET = Tutorial -SAMPLESROOT = $$(SAMPLESROOT) +SAMPLESROOT = $$quote($$(CASROOT)/samples/qt) HEADERS = src/*.h \ $${SAMPLESROOT}/Common/src/*.h \ @@ -25,6 +25,7 @@ RES_DIR = $$quote($$(RES_DIR)) INCLUDEPATH += $$quote($${SAMPLESROOT}/Common/src) INCLUDEPATH += $$quote($${SAMPLESROOT}/Interface/src) +INCLUDEPATH += $$quote($$(CASROOT)/inc) OCCT_DEFINES = $$(CSF_DEFINES) @@ -32,21 +33,18 @@ DEFINES = $$split(OCCT_DEFINES, ;) unix { UNAME = $$system(uname -s) - INCLUDES = $$(CSF_OPT_INC) - PATHS = $$split(INCLUDES,":") - for(path, PATHS):INCLUDEPATH += $${path} LIBLIST = $$(LD_LIBRARY_PATH) LIBPATHS = $$split(LIBLIST,":") for(lib, LIBPATHS):LIBS += -L$${lib} CONFIG(debug, debug|release) { - DESTDIR = ./$$UNAME/bind - OBJECTS_DIR = ./$$UNAME/objd - MOC_DIR = ./$$UNAME/mocd + DESTDIR = ./$$UNAME/bind + OBJECTS_DIR = ./$$UNAME/objd + MOC_DIR = ./$$UNAME/mocd } else { - DESTDIR = ./$$UNAME/bin - OBJECTS_DIR = ./$$UNAME/obj - MOC_DIR = ./$$UNAME/moc + DESTDIR = ./$$UNAME/bin + OBJECTS_DIR = ./$$UNAME/obj + MOC_DIR = ./$$UNAME/moc } MACOSX_USE_GLX = $$(MACOSX_USE_GLX) @@ -58,33 +56,22 @@ unix { !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD LIBS += -lfreeimageplus LIBS += -ltbb -ltbbmalloc + QMAKE_CXXFLAGS += -std=gnu++11 } win32 { - INCLUDES = $$(CSF_OPT_INC) - PATHS = $$split(INCLUDES,";") - for(path, PATHS):INCLUDEPATH += $${path} - CONFIG(debug, debug|release) { - DEFINES += _DEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bind - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd - MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd - !contains(QMAKE_HOST.arch, x86_64) { - LIBS = -L$(CSF_OPT_LIB32D) - } else { - LIBS = -L$(CSF_OPT_LIB64D) - } + DEFINES += _DEBUG + 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 } else { - DEFINES += NDEBUG - DESTDIR = ./win$(ARCH)/$(VCVER)/bin - OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj - MOC_DIR = ./win$(ARCH)/$(VCVER)/moc - !contains(QMAKE_HOST.arch, x86_64) { - LIBS = -L$(CSF_OPT_LIB32) - } else { - LIBS = -L$(CSF_OPT_LIB64) - } + 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 } DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS } diff --git a/samples/qt/Tutorial/custom.bat b/samples/qt/Tutorial/custom.bat new file mode 100644 index 0000000000..4597f54feb --- /dev/null +++ b/samples/qt/Tutorial/custom.bat @@ -0,0 +1,4 @@ +@echo off +rem Define QT_DIR variables in order to load OCCT environment + +set "QT_DIR=" diff --git a/samples/qt/Tutorial/custom.sh b/samples/qt/Tutorial/custom.sh index 7442d2290f..9a6500928e 100755 --- a/samples/qt/Tutorial/custom.sh +++ b/samples/qt/Tutorial/custom.sh @@ -1,10 +1,4 @@ -#!/bin/sh +#!/bin/bash +#Define QT_DIR variables in order to generate Makefile files by qmake -#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake. -#If you are using Mac OS X it is necessary to define WOKHOME as a path to your WOK installation directory. - -export CASROOT="" - -export QTDIR="" - -export WOKHOME="" +export QT_DIR="" diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat index dc58bd5d77..8ac246656c 100755 --- a/samples/qt/Tutorial/env.bat +++ b/samples/qt/Tutorial/env.bat @@ -1,6 +1,11 @@ +@echo off + +call "custom.bat" %1 %2 %3 + call "%~dp0..\..\..\env.bat" %1 %2 %3 -SET "SAMPLESROOT=%~dp0.." -SET "RES_DIR=%~dp0win%ARCH%\%VCVER%\res" -SET "CSF_ResourcesDefaults=%RES_DIR%" -SET "CSF_TutorialResourcesDefaults=%RES_DIR%" +set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res" +set "CSF_ResourcesDefaults=%RES_DIR%" +set "CSF_TutorialResourcesDefaults=%RES_DIR%" + +set "PATH=%QT_DIR%/bin;%PATH%" diff --git a/samples/qt/Tutorial/env.sh b/samples/qt/Tutorial/env.sh index dcc2990425..e26767091f 100755 --- a/samples/qt/Tutorial/env.sh +++ b/samples/qt/Tutorial/env.sh @@ -1,19 +1,17 @@ -#!/bin/sh +#!/bin/bash -if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi +export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -if test "${CASROOT}" == ""; then - echo "Environment variable \"CASROOT\" not defined. Define it in \"custom.sh\" script." - exit 1 +if [ -e "custom.sh" ]; then + source "custom.sh"; fi -if test "${QTDIR}" == ""; then - echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script." - exit 1 +if [ -e "${aSamplePath}/../../../env.sh" ]; then + source "${aSamplePath}/../../../env.sh"; fi -if test `uname -s` == "Darwin" && test "${WOKHOME}" == ""; then - echo "Environment variable \"WOKHOME\" not defined. Define it in \"custom.sh\" script." +if test "${QT_DIR}" == ""; then + echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script." exit 1 fi @@ -21,7 +19,4 @@ host=`uname -s` export STATION=$host export RES_DIR=${aSamplePath}/${STATION}/res -export PATH=${QTDIR}/bin:${PATH} - -source $CASROOT/env.sh -export CSF_OPT_INC="${CASROOT}/inc:${WOKHOME}/lib:${CSF_OPT_INC}" +export PATH=${QT_DIR}/bin:${PATH} diff --git a/samples/qt/Tutorial/genproj.bat b/samples/qt/Tutorial/genproj.bat index 7830bfd6d0..2cac91964b 100644 --- a/samples/qt/Tutorial/genproj.bat +++ b/samples/qt/Tutorial/genproj.bat @@ -1,5 +1,6 @@ +@echo off REM Generation of vcproj files with qmake utilite -REM Variable QTDIR and PATH to qmake executable must be defined without fail +REM Variable QT_DIR 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) diff --git a/samples/qt/Tutorial/make.sh b/samples/qt/Tutorial/make.sh index 895403a749..791c414b9a 100644 --- a/samples/qt/Tutorial/make.sh +++ b/samples/qt/Tutorial/make.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi diff --git a/samples/qt/Tutorial/run.sh b/samples/qt/Tutorial/run.sh index c2eb83498f..c06f3fed5e 100755 --- a/samples/qt/Tutorial/run.sh +++ b/samples/qt/Tutorial/run.sh @@ -1,6 +1,7 @@ -#!/bin/sh +#!/bin/bash export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi cd $aSamplePath -- 2.39.5