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
ac698f80
Commit
ac698f80
authored
Dec 09, 2020
by
Max Lyon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ACG_to_VCI' into 'master'
rename ACG to VCI See merge request
!80
parents
a10f4f84
ec99543a
Pipeline
#16237
passed with stage
in 5 minutes and 47 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
src/CMakeLists.txt
src/CMakeLists.txt
+9
-9
No files found.
src/CMakeLists.txt
View file @
ac698f80
...
...
@@ -34,17 +34,17 @@ configure_file (
)
# If we are in a subdirectory of another project that has a
ACG
Common module
# (e.g. OpenFlipper), we will use
acg
_add_library; otherwise behave "normally".
include
(
ACG
Common OPTIONAL RESULT_VARIABLE IN_
ACG
_BUILD
)
if
(
IN_
ACG
_BUILD
)
message
(
"OVM is being built as part of an
ACG
project, using
acg
_add_library!"
)
# If we are in a subdirectory of another project that has a
VCI
Common module
# (e.g. OpenFlipper), we will use
vci
_add_library; otherwise behave "normally".
include
(
VCI
Common OPTIONAL RESULT_VARIABLE IN_
VCI
_BUILD
)
if
(
IN_
VCI
_BUILD
)
message
(
"OVM is being built as part of an
VCI
project, using
vci
_add_library!"
)
if
(
WIN32 OR EMSCRIPTEN
)
acg
_add_library
(
OpenVolumeMesh STATIC
${
SOURCE_FILES
}
)
vci
_add_library
(
OpenVolumeMesh STATIC
${
SOURCE_FILES
}
)
else
()
acg
_add_library
(
OpenVolumeMesh SHARED
${
SOURCE_FILES
}
)
vci
_add_library
(
OpenVolumeMesh SHARED
${
SOURCE_FILES
}
)
endif
()
else
(
IN_
ACG
_BUILD
)
else
(
IN_
VCI
_BUILD
)
if
(
WIN32
)
# Windows .dll build is not supported yet.
# TODO: turn this on once we have OVM_EXPORT macros in all required places,
...
...
@@ -54,7 +54,7 @@ else(IN_ACG_BUILD)
option
(
BUILD_SHARED_LIBS
"Build shared library (*.dll, *.so, *.dylib) instead of static library (*.a, *.lib)"
ON
)
add_library
(
OpenVolumeMesh
${
SOURCE_FILES
}
)
endif
()
endif
(
IN_
ACG
_BUILD
)
endif
(
IN_
VCI
_BUILD
)
add_library
(
OpenVolumeMesh::OpenVolumeMesh ALIAS OpenVolumeMesh
)
...
...
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