Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
d7f6e9a9
Commit
d7f6e9a9
authored
Dec 02, 2011
by
Sylvain Thery
Browse files
Ajout possilité compilation sans Qt
- effet de bord les include qt de Utils/ sont maintenant dans Utils/Qt/
parent
1c2f8544
Changes
34
Hide whitespace changes
Inline
Side-by-side
Apps/CMakeLists.txt
View file @
d7f6e9a9
SET
(
EXECUTABLE_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin
)
# FOR Qt4
SET
(
QT_USE_QTOPENGL TRUE
)
INCLUDE
(
${
QT_USE_FILE
}
)
ADD_DEFINITIONS
(
${
QT_DEFINITIONS
}
)
#
SET(QT_USE_QTOPENGL TRUE)
#
INCLUDE(${QT_USE_FILE})
#
ADD_DEFINITIONS(${QT_DEFINITIONS})
SET
(
CGoGN_LIBS_R topology algo container utils
)
IF
(
WIN32
)
SET
(
CGoGN_LIBS_D topology algo container utils
)
# libs have same name but in different place in Visual
add_subdirectory
(
Examples/Release
)
add_subdirectory
(
Examples/Tests
)
add_subdirectory
(
Tuto
)
ELSE
(
WIN32
)
SET
(
CGoGN_LIBS_D topologyD algoD containerD utilsD
)
add_subdirectory
(
Examples/Release
)
add_subdirectory
(
Examples/Debug
)
add_subdirectory
(
Examples/Tests
)
add_subdirectory
(
Tuto
)
IF
(
WITH_QT
)
add_subdirectory
(
Examples/Debug
)
ENDIF
(
WITH_QT
)
ENDIF
(
WIN32
)
IF
(
WITH_QT
)
add_subdirectory
(
Tuto
)
add_subdirectory
(
Examples/Release
)
ENDIF
(
WITH_QT
)
add_subdirectory
(
Examples/Tests
)
Apps/Examples/Tests/CMakeLists.txt
View file @
d7f6e9a9
...
...
@@ -5,13 +5,6 @@ project(geometryAssertD)
SET
(
CMAKE_BUILD_TYPE Debug
)
# FOR Qt4
SET
(
QT_USE_QTOPENGL TRUE
)
INCLUDE
(
${
QT_USE_FILE
}
)
ADD_DEFINITIONS
(
${
QT_DEFINITIONS
}
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
${
CGoGN_ROOT_DIR
}
/include
...
...
@@ -40,7 +33,9 @@ target_link_libraries( Geom_intersectionD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
concave_rendering_moc concave_rendering.h
)
add_executable
(
concave_renderingD concave_rendering.cpp
${
concave_rendering_moc
}
)
target_link_libraries
(
concave_renderingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
IF
(
WITH_QT
)
QT4_WRAP_CPP
(
concave_rendering_moc concave_rendering.h
)
add_executable
(
concave_renderingD concave_rendering.cpp
${
concave_rendering_moc
}
)
target_link_libraries
(
concave_renderingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
ENDIF
(
WITH_QT
)
Apps/Examples/Tests/concave_rendering.h
View file @
d7f6e9a9
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Utils/cgognStream.h"
// forward definitions (minimize includes)
...
...
Apps/Examples/clipping.h
View file @
d7f6e9a9
...
...
@@ -27,12 +27,12 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/qtInputs.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Utils/
Qt/
qtInputs.h"
#include
"ui_clipping.h"
// inclure qtui.h juste après le ui_xxx.h
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/map/embeddedMap3.h"
...
...
Apps/Examples/extrusionView.h
View file @
d7f6e9a9
...
...
@@ -28,7 +28,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
// forward definitions (minimize includes)
namespace
CGoGN
{
namespace
Algo
{
namespace
Render
{
namespace
GL2
{
class
MapRender
;
}}}}
...
...
Apps/Examples/frame_manip.h
View file @
d7f6e9a9
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Utils/frameManipulator.h"
#include
"Utils/drawer.h"
...
...
Apps/Examples/polyhedronsView.h
View file @
d7f6e9a9
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
// forward definitions (minimize includes)
namespace
CGoGN
{
namespace
Algo
{
namespace
Render
{
namespace
GL2
{
class
MapRender
;
}}}}
...
...
Apps/Examples/simpleGMap2.h
View file @
d7f6e9a9
...
...
@@ -24,7 +24,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/gmap/embeddedGMap2.h"
...
...
Apps/Examples/simpleGMap3.h
View file @
d7f6e9a9
...
...
@@ -24,7 +24,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/gmap/embeddedGMap3.h"
...
...
Apps/Examples/simpleMap3.h
View file @
d7f6e9a9
...
...
@@ -24,7 +24,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/map/embeddedMap3.h"
...
...
Apps/Examples/texturesExample.h
View file @
d7f6e9a9
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Utils/textures.h"
#include
"Utils/Shaders/shaderSimpleTexture.h"
#include
"Utils/Shaders/shaderTextureMask.h"
...
...
Apps/Examples/viewer.h
View file @
d7f6e9a9
...
...
@@ -24,9 +24,9 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"ui_viewer.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/map/embeddedMap2.h"
...
...
Apps/Tuto/tp_master.h
View file @
d7f6e9a9
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
// forward definitions (minimize includes)
namespace
CGoGN
{
namespace
Algo
{
namespace
Render
{
namespace
GL2
{
class
MapRender
;
}
}
}
}
...
...
Apps/Tuto/tuto1.h
View file @
d7f6e9a9
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Utils/cgognStream.h"
// forward definitions (minimize includes)
...
...
Apps/Tuto/tuto2.h
View file @
d7f6e9a9
...
...
@@ -27,9 +27,9 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"ui_tuto2.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Geometry/vector_gen.h"
...
...
Apps/Tuto/tuto3.h
View file @
d7f6e9a9
...
...
@@ -25,7 +25,7 @@
#ifndef _TUTO3_H_
#define _TUTO3_H_
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
// forward definition (minimize includes)
namespace
CGoGN
{
namespace
Algo
{
namespace
Render
{
namespace
GL2
{
class
MapRender
;
}
}
}
}
...
...
Apps/Tuto/tuto4.h
View file @
d7f6e9a9
...
...
@@ -25,11 +25,11 @@
#ifndef _TUTO4_H_
#define _TUTO4_H_
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"ui_tuto4.h"
// inclure qtui.h juste après le ui_xxx.h
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
// forward definitions (minimize includes) syntax a little bit tricky !!
namespace
CGoGN
{
namespace
Algo
{
namespace
Render
{
namespace
GL2
{
class
MapRender
;
class
TopoRenderMapD
;
}
}
}
}
...
...
Apps/Tuto/tuto5.h
View file @
d7f6e9a9
...
...
@@ -28,11 +28,11 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"ui_tuto5.h"
// inclure qtui.h juste après le ui_xxx.h
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
// forward definitions (minimize includes)
namespace
CGoGN
{
namespace
Algo
{
namespace
Render
{
namespace
GL2
{
class
MapRender
;
}
}
}
}
...
...
Apps/Tuto/tuto_mt.cpp
View file @
d7f6e9a9
...
...
@@ -42,7 +42,7 @@
#include
"Algo/Parallel/parallel_foreach.h"
// for file input
#include
"Utils/qtInputs.h"
#include
"Utils/
Qt/
qtInputs.h"
using
namespace
CGoGN
;
...
...
Apps/Tuto/tuto_mt.h
View file @
d7f6e9a9
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Utils/cgognStream.h"
// forward definitions (minimize includes)
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment