Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Hurstel
CGoGN
Commits
f6bf97c8
Commit
f6bf97c8
authored
Sep 14, 2012
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MR modification: FORCE_MR: 0->mono 1->multi
parent
4ee493af
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
14 deletions
+3
-14
CMakeLists.txt
CMakeLists.txt
+1
-7
apps_cmake.txt
apps_cmake.txt
+0
-3
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+2
-4
No files found.
CMakeLists.txt
View file @
f6bf97c8
...
...
@@ -16,7 +16,7 @@ SET ( WITH_ZINRI ON CACHE BOOL "build CGoGN with Zinri lib ")
SET
(
WITH_QT ON CACHE BOOL
"build CGoGN with Qt lib "
)
SET
(
WITH_NUMERICAL ON CACHE BOOL
"build CGoGN with Numerical libs support "
)
# for CGoGN MR
SET
(
FORCE_MR
"
2
"
CACHE STRING
"0:no
ne / 1 force multi / 2: force
mo
no
"
)
SET
(
FORCE_MR
"
0
"
CACHE STRING
"0:
no
rmal mode / 1 multires
mo
de
"
)
#create one big lib
SET
(
ONELIB OFF CACHE BOOL
"build CGoGN in one lib"
)
...
...
@@ -47,12 +47,6 @@ IF (FORCE_MR EQUAL 1)
file
(
WRITE
${
CGoGN_ROOT_DIR
}
/include/cgogn_mr.h
"1"
)
ENDIF
(
FORCE_MR EQUAL 1
)
IF
(
FORCE_MR EQUAL 2
)
add_definitions
(
-DCGoGN_FORCE_MR=2
)
file
(
WRITE
${
CGoGN_ROOT_DIR
}
/include/cgogn_mr.h
"2"
)
ENDIF
(
FORCE_MR EQUAL 2
)
IF
(
ONELIB
)
file
(
WRITE
${
CGoGN_ROOT_DIR
}
/include/cgogn_onelib.h
"1"
)
...
...
apps_cmake.txt
View file @
f6bf97c8
...
...
@@ -14,9 +14,6 @@ file(STRINGS ${CGoGN_ROOT_DIR}/include/cgogn_mr.h FORCE_MR)
IF (FORCE_MR EQUAL 1)
add_definitions(-DCGoGN_FORCE_MR=1)
ENDIF (FORCE_MR EQUAL 1)
IF (FORCE_MR EQUAL 2)
add_definitions(-DCGoGN_FORCE_MR=2)
ENDIF (FORCE_MR EQUAL 2)
# for CGoGN in one lib on not
...
...
include/Topology/generic/genericmap.h
View file @
f6bf97c8
...
...
@@ -126,11 +126,9 @@ protected:
* is map a multiresolution map
*/
#ifndef CGoGN_FORCE_MR
bool
m_isMultiRes
;
#elif CGoGN_FORCE_MR == 1
static
const
bool
m_isMultiRes
=
true
;
#else
static
const
bool
m_isMultiRes
=
false
;
#else
static
const
bool
m_isMultiRes
=
true
;
#endif
/**
...
...
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