Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
b61b1296
Commit
b61b1296
authored
Jul 16, 2015
by
Christian Schulte zu Berge
Browse files
Fixed vectorfield module CMake file.
Fixed test-campvis on Linux.
parent
7d241eea
Changes
3
Hide whitespace changes
Inline
Side-by-side
modules/vectorfield/vectorfield.cmake
View file @
b61b1296
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
IF
(
${
ModuleEnabled
}
)
IF
(
${
ModuleEnabled
}
)
# Source files:
# Source files:
FILE
(
GLOB ThisModSources RELATIVE
${
ModulesDir
}
FILE
(
GLOB ThisModSources RELATIVE
${
ModulesDir
}
modules/vectorfield/*.cpp
modules/vectorfield/processors/*.cpp
modules/vectorfield/processors/*.cpp
modules/vectorfield/pipelines/*.cpp
modules/vectorfield/pipelines/*.cpp
)
)
...
...
test/main.cpp
View file @
b61b1296
...
@@ -87,15 +87,16 @@ GTEST_API_ int main(int argc, char **argv) {
...
@@ -87,15 +87,16 @@ GTEST_API_ int main(int argc, char **argv) {
testing
::
InitGoogleTest
(
&
argc
,
argv
);
testing
::
InitGoogleTest
(
&
argc
,
argv
);
init
();
init
();
int
ret
;
int
ret
;
std
::
thread
testThread
([
&
]
()
{
std
::
thread
testThread
([
&
]
()
{
cgt
::
GLContextScopedLock
lock
(
_localContext
);
cgt
::
GLContextScopedLock
lock
(
_localContext
);
ret
=
RUN_ALL_TESTS
();
ret
=
RUN_ALL_TESTS
();
app
->
exit
();
});
});
app
->
exec
();
app
->
exec
();
testThread
.
join
();
app
->
exit
();
deinit
();
deinit
();
delete
app
;
delete
app
;
...
...
test/modules/pipelineresultimagetest.cpp
View file @
b61b1296
...
@@ -98,6 +98,9 @@ protected:
...
@@ -98,6 +98,9 @@ protected:
processors
[
i
]
->
invalidate
(
AbstractProcessor
::
INVALID_RESULT
);
processors
[
i
]
->
invalidate
(
AbstractProcessor
::
INVALID_RESULT
);
}
}
}
}
else
{
FAIL
()
<<
"Could not instantiate pipeline '"
<<
_pipelineName
<<
"'"
;
}
}
}
void
execute
()
{
void
execute
()
{
...
@@ -211,3 +214,4 @@ TEST_F(PipelineWriteResultImageTest, TensorDemo) {
...
@@ -211,3 +214,4 @@ TEST_F(PipelineWriteResultImageTest, TensorDemo) {
}
}
#endif
#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