Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
ad214e55
Commit
ad214e55
authored
Jun 19, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cleanups' into 'master'
Cleanups See merge request
!35
parents
40247daf
50720181
Pipeline
#7239
passed with stage
in 9 minutes and 47 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
CMakeLists.txt
CMakeLists.txt
+5
-7
documentation/doxy.config.in
documentation/doxy.config.in
+6
-1
No files found.
CMakeLists.txt
View file @
ad214e55
cmake_minimum_required
(
VERSION 2.6
)
cmake_minimum_required
(
VERSION 3.1.0 FATAL_ERROR
)
if
(
"
${
PROJECT_NAME
}
"
STREQUAL
""
)
message
(
"Setting project name to OpenVolumeMesh"
)
...
...
@@ -13,11 +12,15 @@ endif()
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake
)
set
(
CMAKE_DEBUG_POSTFIX
"d"
)
# Enable bigobj on MSVC Windows debug mode
if
(
MSVC
)
add_compile_options
(
"$<IF:$<CXX_COMPILER_ID:MSVC>,$<$<CONFIG:DEBUG>:/bigobj>,>"
)
endif
()
if
(
WIN32
)
add_definitions
(
-D_USE_MATH_DEFINES -DNOMINMAX
)
endif
()
# include our cmake files
include
(
ACGCommon
)
...
...
@@ -26,11 +29,6 @@ acg_get_version ()
include
(
ACGOutput
)
if
(
WIN32
)
add_definitions
(
-D_USE_MATH_DEFINES -DNOMINMAX
)
endif
()
# ========================================================================
# Call the subdirectories with the projects
...
...
documentation/doxy.config.in
View file @
ad214e55
# Doxyfile 1.8.1
2
# Doxyfile 1.8.1
3
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
...
...
@@ -2387,6 +2387,11 @@ DIAFILE_DIRS =
PLANTUML_JAR_PATH =
# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
# configuration file for plantuml.
PLANTUML_CFG_FILE =
# When using plantuml, the specified paths are searched for files specified by
# the !include statement in a plantuml block.
...
...
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