fix CMake for Qt example application

ifcapps · ifcapps · commit ec85f618f432 · 2021-03-05T12:08:20.000+01:00
diff --git a/examples/LoadFileExampleConsole/LoadFileExampleConsole.vcxproj b/examples/LoadFileExampleConsole/LoadFileExampleConsole.vcxproj
@@ -75,12 +75,16 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin\</OutDir>
+    <IntDir>bin\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin\</OutDir>
+    <IntDir>bin\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/examples/SimpleViewerExampleQt/CMakeLists.txt b/examples/SimpleViewerExampleQt/CMakeLists.txt
@@ -117,6 +117,7 @@ TARGET_INCLUDE_DIRECTORIES(SimpleViewerExample
     ${OSGUTIL_INCLUDE_DIR}
     ${OSGANIMATION_INCLUDE_DIR}
     ${OSGTEXT_INCLUDE_DIR}
+	${Qt5Core_INCLUDE_DIRS}
 )
 
 INSTALL(
diff --git a/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj b/examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj
@@ -123,7 +123,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName)d.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\IfcPlusPlus\bin;..\..\external\Carve\bin;$(QTDIR)\lib;$(OSG_DIR)\build\lib;$(FREETYPE_DIR)\objs\vc2010\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\IfcPlusPlus\bin;..\..\external\Carve\bin;$(QTDIR)\lib;$(OSG_DIR)\lib;$(OSG_DIR)\build\lib;$(FREETYPE_DIR)\objs\vc2010\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Networkd.lib;Qt5OpenGLd.lib;Qt5Widgetsd.lib;Qt5PrintSupportd.lib;Qt5Xmld.lib;osgd.lib;OpenThreadsd.lib;osgAnimationd.lib;osgDBd.lib;osgFXd.lib;osgGAd.lib;osgTextd.lib;osgUtild.lib;osgViewerd.lib;IfcPlusPlusd.lib;Carved.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
diff --git a/examples/SimpleViewerExampleQt/src/IfcPlusPlusSystem.h b/examples/SimpleViewerExampleQt/src/IfcPlusPlusSystem.h
@@ -17,7 +17,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 #pragma once
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <osg/Material>
 #include <osgGA/GUIEventHandler>
 #include "ifcpp/model/BasicTypes.h"
diff --git a/examples/SimpleViewerExampleQt/src/gui/IfcTreeWidget.h b/examples/SimpleViewerExampleQt/src/gui/IfcTreeWidget.h
@@ -17,7 +17,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 #pragma once
 
-#include <QTreeWidget>
+#include <QtWidgets/QTreeWidget>
 #include "ifcpp/model/BasicTypes.h"
 
 class BuildingEntity;
diff --git a/examples/SimpleViewerExampleQt/src/gui/MainWindow.cpp b/examples/SimpleViewerExampleQt/src/gui/MainWindow.cpp
@@ -16,13 +16,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 */
 
 
-#include <QAction>
-#include <QDesktopWidget>
-#include <QDockWidget>
-#include <QFile>
-#include <QStatusBar>
-#include <QSettings>
-#include <QToolButton>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QDockWidget>
+#include <QtCore/QFile>
+#include <QtWidgets/QStatusBar>
+#include <QtCore/QSettings>
+#include <QtWidgets/QToolButton>
 
 #include "IncludeGeometryHeaders.h"
 #include "IfcPlusPlusSystem.h"
diff --git a/examples/SimpleViewerExampleQt/src/gui/MainWindow.h b/examples/SimpleViewerExampleQt/src/gui/MainWindow.h
@@ -17,11 +17,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 #pragma once
 
-#include <QLabel>
-#include <QMainWindow>
-#include <QProgressBar>
-#include <QSplitter>
-#include <QToolBar>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QToolBar>
 
 class IfcPlusPlusSystem;
 class TabReadWrite;
diff --git a/examples/SimpleViewerExampleQt/src/gui/TabReadWrite.cpp b/examples/SimpleViewerExampleQt/src/gui/TabReadWrite.cpp
@@ -18,11 +18,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #pragma warning( disable: 4996 )
 #include <random>
 #include <sstream>
-#include <QKeyEvent>
-#include <QFileDialog>
-#include <QFile>
-#include <QSettings>
-#include <QTextStream>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFile>
+#include <QtCore/QSettings>
+#include <QtCore/QTextStream>
 #include <osgUtil/Optimizer>
 
 #include <ifcpp/model/BasicTypes.h>
diff --git a/examples/SimpleViewerExampleQt/src/gui/TabReadWrite.h b/examples/SimpleViewerExampleQt/src/gui/TabReadWrite.h
@@ -23,17 +23,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <ifcpp/model/OpenMPIncludes.h>
 
 #include <QtCore/qglobal.h>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QTreeWidget>
-#include <QLabel>
-#include <QComboBox>
-#include <QPushButton>
-#include <QProgressBar>
-#include <QLineEdit>
-#include <QSplitter>
-#include <QApplication>
-#include <QTextEdit>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QTextEdit>
 
 class ViewerWidget;
 class BuildingEntity;
diff --git a/examples/SimpleViewerExampleQt/src/gui/TabView.cpp b/examples/SimpleViewerExampleQt/src/gui/TabView.cpp
@@ -15,15 +15,15 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTH
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <qglobal.h>
-#include <QSettings>
-#include <QToolButton>
-#include <QBoxLayout>
-#include <QCheckBox>
-#include <QRadioButton>
-#include <QButtonGroup>
-#include <QLabel>
-#include <QSpinBox>
+#include <QtCore/qglobal.h>
+#include <QtCore/QSettings>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpinBox>
 
 #include <osgGA/OrbitManipulator>
 
diff --git a/examples/SimpleViewerExampleQt/src/gui/TabView.h b/examples/SimpleViewerExampleQt/src/gui/TabView.h
@@ -17,10 +17,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 #pragma once
 
-#include <qglobal.h>
-#include <QWidget>
-#include <QSpinBox>
-#include <QCheckBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QCheckBox>
 
 class IfcPlusPlusSystem;
 class ViewerWidget;
diff --git a/examples/SimpleViewerExampleQt/src/main.cpp b/examples/SimpleViewerExampleQt/src/main.cpp
@@ -22,8 +22,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <string>
 
 #include <QtCore/qglobal.h>
-#include <QApplication>
-#include <QSplashScreen>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QSplashScreen>
 #include <osgViewer/CompositeViewer>
 
 #include <ifcpp/model/BuildingException.h>
diff --git a/examples/SimpleViewerExampleQt/src/viewer/GraphicsWindowQt.cpp b/examples/SimpleViewerExampleQt/src/viewer/GraphicsWindowQt.cpp
@@ -17,13 +17,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 #include <osg/Version>
 #include <osgViewer/ViewerBase>
-#include <QInputEvent>
-#include <QOpenGLContext>
+#include <QtGui/QInputEvent>
+#include <QtGui/QOpenGLContext>
 
 #if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0))
 	#define USE_GESTURES
-	#include <QGestureEvent>
-	#include <QGesture>
+	#include <QtWidgets/QGestureEvent>
+	#include <QtWidgets/QGesture>
 #endif
 
 #include "GraphicsWindowQt.h"
diff --git a/examples/SimpleViewerExampleQt/src/viewer/GraphicsWindowQt.h b/examples/SimpleViewerExampleQt/src/viewer/GraphicsWindowQt.h
@@ -24,8 +24,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <QEvent>
 #include <QQueue>
 #include <QSet>
-#include <QOpenGLWidget>
-#include <QOpenGLFunctions>
+#include <QtWidgets/QOpenGLWidget>
+#include <QtGui/QOpenGLFunctions>
 
 class QInputEvent;
 class QGestureEvent;
diff --git a/examples/SimpleViewerExampleQt/src/viewer/ViewerWidget.cpp b/examples/SimpleViewerExampleQt/src/viewer/ViewerWidget.cpp
@@ -28,8 +28,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <osg/MatrixTransform>
 #include <osgViewer/CompositeViewer>
 #include <QtCore/qglobal.h>
-#include <QVBoxLayout>
-#include <QLabel>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
 #include <QtGui/QKeyEvent>
 
 #include "IfcPlusPlusSystem.h"
diff --git a/examples/SimpleViewerExampleQt/src/viewer/ViewerWidget.h b/examples/SimpleViewerExampleQt/src/viewer/ViewerWidget.h
@@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <osg/Material>
 #include <QtCore/qglobal.h>
 #include <QtCore/QTimer>
-#include <qwidget.h>
+#include <QtWidgets/QWidget>
 
 #include "GraphicsWindowQt.h"
 class IfcPlusPlusSystem;
diff --git a/set_devenv-VS2019.cmd b/set_devenv-VS2019.cmd
@@ -4,60 +4,19 @@ set OSG_LIBRARY_PATH=%OSG_DIR%\bin
 set OSG_PLUGINS_LIB=%OSG_DIR%\lib\osgPlugins-3.6.5
 set OSG_FILE_PATH=%LIB_DIR%\OSG\OpenSceneGraph-Data;%LIB_DIR%\OSG\OpenSceneGraph-Data\Images;%LIB_DIR%\OSG\OpenSceneGraph-Data\fonts;
 
-set OCCT_DIR=%LIB_DIR%\opencascade\7.4.0\
-set FREEIMAGE_DIR=%LIB_DIR%\opencascade\freeimage-3.17.0-vc14-64
-set FREETYPE_DIR=%LIB_DIR%\freetype\2.10.2
-
-set TCL_DIR=%LIB_DIR%\tcltk-86-64
-set VTK_LIB_SUFFIX=9.0
-set VTK_DIR=%LIB_DIR%\VTK-9.0.0
-set PYTHONPATH=C:\Users\Gerold\AppData\Local\Programs\Python\Python35-32\
-
-set wxWidgets_ROOT_DIR=%LIB_DIR%\wxWidgets-3.1.3
-set wxWidgets_LIB_DIR=%LIB_DIR%\wxWidgets-3.1.3\build\lib\vc_x64_dll
-
-set CSF_OPT_INC=%OCCT_DIR%\inc\;%FREETYPE_DIR%\include;%TCL_DIR%\include;%VTK_DIR%\include;%VTK_DIR%\build\include;
-set CSF_OPT_LIB64=%FREETYPE_DIR%\build\Release;%TCL_DIR%\lib;%VTK_DIR%\lib;%FREEIMAGE_DIR%\lib;%OCCT_DIR%..\gl2ps-1.3.8-vc14-64\lib;%OCCT_DIR%..\ffmpeg-20181007-0a41a8b-win64-dev\lib
-set CSF_OPT_LIB64D=%FREETYPE_DIR%\build\Debug;%TCL_DIR%\lib;%VTK_DIR%\lib;%FREEIMAGE_DIR%\lib;%OCCT_DIR%..\gl2ps-1.3.8-vc14-64\lib;%OCCT_DIR%..\ffmpeg-20181007-0a41a8b-win64-dev\lib
-set CSF_ShadersDirectory=%OCCT_DIR%\src\Shaders
-set DRAWDEFAULT=%OCCT_DIR%\data\occ\Ball.brep
-
-rem set BOOST_DIR=%LIB_DIR%\boost\1_74_0\
-set Boost_DIR=%LIB_DIR%\boost\1_75_0\
-set Boost_ROOT=D:\lib\boost\1_75_0\
-set Boost_INCLUDE_DIR=%LIB_DIR%\boost\1_74_0\
-
 set QMAKESPEC=win32-msvc
 set QMAKE_TARGET.arch=x86_64
 set QTDIR=%LIB_DIR%\Qt\5.14\5.14.1\msvc2017_64
 
 set IFCPP_DIR=D:\work\IfcPlusPlus\
 
-set COINDIR=%IFCPP_DIR%external\Coin3D
-set Coin_DIR=%IFCPP_DIR%external\Coin3D
-
 @echo off
 PATH=%OSG_DIR%\bin;%PATH%
 PATH=%OSG_PLUGINS_LIB%;%PATH%
 PATH=%QTDIR%\bin;%PATH%
 PATH=%QTDIR%\qtbase\bin;%PATH%
 PATH=%QTDIR%\gnuwin32\bin;%PATH%
-PATH=%LIB_DIR%\depends22_x64\;%PATH%
-PATH=C:\Program Files (x86)\WiX Toolset v3.11\bin;%PATH%
-PATH=%OCCT_DIR%\win64\vc14\bin;%PATH%
-PATH=%OCCT_DIR%\win64\vc14\bind;%PATH%
-PATH=%OCCT_DIR%\win64\vc12\bin;%PATH%
-PATH=%TBB_DIR%\bin\intel64\vc12;%PATH%
-PATH=%FREEIMAGE_DIR%\bin\;%PATH%
-PATH=%FREETYPE_DIR%\bin\;%PATH%
-PATH=%GL2PS_DIR%\bin\;%PATH%
-PATH=%TCL_DIR%\bin\;%PATH%
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-
-rem cd /D D:\work\
-rem cd ..
-cd "C:\Program files\cmake\bin"
-
+cd /D D:\work\
 devenv
-
diff --git a/set_devenv64-VS2013.cmd b/set_devenv64-VS2013.cmd
@@ -3,18 +3,13 @@ set OSG_LIBRARY_PATH=%OSG_DIR%\bin
 set OSG_PLUGINS_LIB=%OSG_DIR%\lib\osgPlugins-3.2.1
 set OSG_FILE_PATH=D:\lib\OSG\OpenSceneGraph-Data;D:\lib\OSG\OpenSceneGraph-Data\Images;D:\lib\OSG\OpenSceneGraph-Data\fonts;
 
-set BOOST_DIR=D:\lib\boost
-set CGAL_DIR=D:\lib\CSG\CGAL\CGAL-4.3-install\auxiliary\gmp\lib\
-
 set QMAKESPEC=win32-msvc2013
 set QMAKE_TARGET.arch=x86_64
 set QTDIR=D:\lib\Qt\5.3.0-install\5.3\msvc2013_64_opengl
 
 PATH=%OSG_DIR%\bin;%PATH%
 PATH=%OSG_PLUGINS_LIB%;%PATH%
 PATH=%QTDIR%\bin;%PATH%
-PATH=%CGAL_DIR%\bin;%PATH%
-PATH=C:\Program Files (x86)\WiX Toolset v3.8\bin;%PATH%
 
 call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
 

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ TARGET_INCLUDE_DIRECTORIES(SimpleViewerExample`
`117`	`117`	`${OSGUTIL_INCLUDE_DIR}`
`118`	`118`	`${OSGANIMATION_INCLUDE_DIR}`
`119`	`119`	`${OSGTEXT_INCLUDE_DIR}`
	`120`	`+ ${Qt5Core_INCLUDE_DIRS}`
`120`	`121`	`)`
`121`	`122`
`122`	`123`	`INSTALL(`