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
OpenFlipper-Free
OpenFlipper-Free
Commits
65586257
Commit
65586257
authored
Nov 08, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into warnings
parents
3e1e4863
1edfc16d
Pipeline
#3557
passed with stage
in 91 minutes and 46 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
1 deletion
+21
-1
ACG/CMakeLists.txt
ACG/CMakeLists.txt
+1
-0
CMakeLists.txt
CMakeLists.txt
+16
-0
cmake/ACGCommon.cmake
cmake/ACGCommon.cmake
+3
-0
libs_required/OpenMesh
libs_required/OpenMesh
+1
-1
No files found.
ACG/CMakeLists.txt
View file @
65586257
...
...
@@ -86,6 +86,7 @@ set (directories
Geometry
Config
Geometry/Types
Geometry/bsp
GL
Glut
IO
...
...
CMakeLists.txt
View file @
65586257
...
...
@@ -79,6 +79,22 @@ include (MSVCMacros)
acg_get_version
(
OpenFlipper
)
# ========================================================================
# qtcrator workaround for missing files in project
# ========================================================================
# qtcreator (4.0.3) does not include some header files and *T.cc in its
# project structure. The issue is well-known, this is a workaround.
# Unfortunately I could not find a workaround that does not involve adding
# a dummy target that is visible in the target list.
# To force adding files to the project structure, use
# target_sources(_qtcreator_add_files PUBLIC ${EXTRA_FILES})
# in your CMakeLists.txt templates of the form (*T.cc) are added automatically
add_library
(
_qtcreator_add_files CMakeLists.txt
)
# dummy file that always exists
set_target_properties
(
_qtcreator_add_files PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1
)
# ========================================================================
# Branding
# ========================================================================
...
...
cmake/ACGCommon.cmake
View file @
65586257
...
...
@@ -279,6 +279,9 @@ macro (acg_drop_templates list)
foreach
(
_file
${${
list
}}
)
if
(
_file MATCHES
"T.cc$"
)
list
(
REMOVE_ITEM
${
list
}
${
_file
}
)
# Append removed sources to a dummy target to make them available in qtcreator
target_sources
(
_qtcreator_add_files PUBLIC
${
_file
}
)
endif
()
endforeach
()
endmacro
()
...
...
OpenMesh
@
22554e00
Compare
14305523
...
22554e00
Subproject commit
1430552372e3e4e312a81b10371b07812ee603b7
Subproject commit
22554e000ae7b79d6bd1cf4f90de74fd922c1359
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