Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
b6347582
Commit
b6347582
authored
Oct 09, 2015
by
Fabio Bas
Browse files
Revert option from WITH_TESTS to TEST
parent
7fe60279
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b6347582
...
...
@@ -234,8 +234,8 @@ if(WITH_ORACLE)
endif
()
# Compile tests (default off)
option
(
WITH_
TEST
S
"build tests"
OFF
)
if
(
WITH_
TEST
S
)
option
(
TEST
"build tests"
OFF
)
if
(
TEST
)
include
(
CTest
)
add_subdirectory
(
tests
)
endif
()
travis-compile.sh
View file @
b6347582
...
...
@@ -13,7 +13,7 @@ if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then
fi
if
[[
$BUILDTYPE
==
"Debug"
]]
;
then
cmake ..
-DWITH_SERVER
=
1
-D
WITH_
TEST
S
=
1
-DCMAKE_BUILD_TYPE
=
$BUILDTYPE
-DWITH_QT4
=
$QT4
$prefix
cmake ..
-DWITH_SERVER
=
1
-DTEST
=
1
-DCMAKE_BUILD_TYPE
=
$BUILDTYPE
-DWITH_QT4
=
$QT4
$prefix
make
-j2
make
test
else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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