blob: ad33095e0f84738b00f50f00251fbb5c40ee4fcf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
diff -Naur IfcPlusPlus.orig/SimpleViewerExample/CMakeLists.txt IfcPlusPlus/SimpleViewerExample/CMakeLists.txt
--- IfcPlusPlus.orig/SimpleViewerExample/CMakeLists.txt 2015-10-28 19:30:23.433684274 +0100
+++ IfcPlusPlus/SimpleViewerExample/CMakeLists.txt 2015-10-28 19:35:52.540352016 +0100
@@ -11,25 +11,6 @@
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
-
-# Qt library --> to be able to use precompiled osg binary of Linux distributions qt4 is used on Linux Plattform
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- MESSAGE(STATUS "Linux OS --> Qt4 is used")
- FIND_PACKAGE(Qt4 REQUIRED)
- SET(QT_USE_QTOPENGL TRUE)
- INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${QT_DEFINITIONS})
- ADD_DEFINITIONS(-DQT_GUI_LIBS -DQT_CORE_LIB)
- QT4_ADD_RESOURCES(SimpleViewerExample_RESOURCES_RCC ${IFCPP_SOURCE_DIR}/SimpleViewerExample/Resources/ifcplusplus.qrc)
- INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES}
- ${QT_INCLUDES}
- ${QT_INCLUDE_DIR}
- ${QT_QT_INCLUDE_DIR}
- ${QT_QTCORE_INCLUDE_DIR}
- ${QT_QTGUI_INCLUDE_DIR}
- ${QT_QTOPENGL_INCLUDE_DIR}
- )
-ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
MESSAGE(STATUS "Qt5 is used")
FIND_PACKAGE(Qt5Core REQUIRED)
FIND_PACKAGE(Qt5Widgets REQUIRED)
@@ -44,7 +25,6 @@
${QT_QTOPENGL_INCLUDE_DIR}
${Qt5Widgets_INCLUDE_DIRS}
)
-ENDIF()
FIND_PACKAGE(OpenSceneGraph REQUIRED osgDB osgUtil osgGA osgFX osgSim osgText osgQt osgViewer)
@@ -98,11 +78,7 @@
ADD_DEFINITIONS( -DCARVE_SYSTEM_BOOST )
ENDIF()
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- QT4_WRAP_CPP( IFCPPVIEWER_MOC_GENERATED_FILES ${IFCPPVIEWER_MOC_FILES})
-ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
QT5_WRAP_CPP( IFCPPVIEWER_MOC_GENERATED_FILES ${IFCPPVIEWER_MOC_FILES})
-ENDIF()
LINK_DIRECTORIES (${LINK_DIRECTORIES} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
LINK_DIRECTORIES (${LINK_DIRECTORIES} ${CARVE_BINARY_DIR}/lib)
@@ -116,11 +92,7 @@
${SimpleViewerExample_RESOURCES_RCC}
)
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- # do nothing
-ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
QT5_USE_MODULES(SimpleViewerExample Core Gui Widgets OpenGL)
-ENDIF()
TARGET_LINK_LIBRARIES(SimpleViewerExample ${OPENTHREADS_LIBRARY} )
TARGET_LINK_LIBRARIES(SimpleViewerExample ${OSG_LIBRARY} )
|