Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
3826f6ad
Commit
3826f6ad
authored
Mar 05, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compilation choice for float/double in SCHNApps
parent
dc15e100
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
1 deletion
+25
-1
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+9
-1
SCHNApps/include/types.h
SCHNApps/include/types.h
+16
-0
No files found.
SCHNApps/CMakeLists.txt
View file @
3826f6ad
...
...
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.8)
project
(
SCHNApps
)
SET
(
CGoGN_SLOT_DEBUG_MODE OFF CACHE BOOL
"build with slot debugging mode"
)
SET
(
CGoGN_SCHNApps_USE_DOUBLE OFF CACHE BOOL
"build with doubled instead of floats"
)
SET
(
CGoGN_WITH_QTCREATOR OFF CACHE BOOL
"use QtCreator to compile"
)
SET
(
CGoGN_ROOT_DIR
${
CMAKE_SOURCE_DIR
}
/.. CACHE STRING
"CGoGN root dir"
)
IF
(
WIN32
)
SET
(
CMAKE_PREFIX_PATH
${
CGoGN_ROOT_DIR
}
/windows_dependencies CACHE STRING
"path to dependencies"
)
...
...
@@ -63,9 +66,14 @@ ENDIF()
# definitions from CGoGN
FILE
(
STRINGS
${
CGoGN_SRC_DIR
}
/include/cgogn_defs.h CGoGN_DEFS
)
#and schnapps options
IF
(
CGoGN_SLOT_DEBUG_MODE
)
LIST
(
APPEND CGoGN_DEFS -DCGoGN_SLOT_DEBUG_MODE=1
)
ENDIF
()
IF
(
${
CGoGN_SCHNApps_USE_DOUBLE
}
)
LIST
(
APPEND CGoGN_DEFS -DSCHNAPPS_USE_DOUBLE=1
)
ENDIF
()
ADD_DEFINITIONS
(
${
CGoGN_DEFS
}
)
# includes from CGoGN + python
...
...
@@ -80,7 +88,7 @@ LIST(APPEND EXT_LIBS PythonQt ${PYTHON_LIBRARIES})
if
(
CMAKE_COMPILER_IS_GNUCXX
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-unused-local-typedefs"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-unused-local-typedefs"
)
endif
()
if
(
WIN32
)
...
...
SCHNApps/include/types.h
View file @
3826f6ad
...
...
@@ -17,6 +17,20 @@ class VBO;
class
GLSLShader
;
}
#ifdef SCHNAPPS_USE_DOUBLE
struct
PFP2
:
public
PFP_DOUBLE
{
typedef
EmbeddedMap2
MAP
;
};
struct
PFP3
:
public
PFP_DOUBLE
{
typedef
EmbeddedMap3
MAP
;
};
#else
struct
PFP2
:
public
PFP_STANDARD
{
typedef
EmbeddedMap2
MAP
;
...
...
@@ -27,6 +41,8 @@ struct PFP3: public PFP_STANDARD
typedef
EmbeddedMap3
MAP
;
};
#endif
namespace
SCHNApps
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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