aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-04-07 13:38:50 +0800
committerchriseth <c@ethdev.com>2016-04-07 13:38:50 +0800
commit054bc2a6ac4857f3aa9d7b5f0ec23ec5a3ee109b (patch)
tree1c9f8ebf68641492ebd1e7a89780370530e755be
parentaa5ac41dff6aa60b1ff6e4911fa6e3613ec48b82 (diff)
parentdebf9ff5b86bb2cfcfbd3ebaad99703f2b41fa47 (diff)
downloaddexon-solidity-054bc2a6ac4857f3aa9d7b5f0ec23ec5a3ee109b.tar.gz
dexon-solidity-054bc2a6ac4857f3aa9d7b5f0ec23ec5a3ee109b.tar.zst
dexon-solidity-054bc2a6ac4857f3aa9d7b5f0ec23ec5a3ee109b.zip
Merge pull request #483 from bobsummerwill/conditional_tests
Added missing CMake conditional around the Solidity tests.
-rw-r--r--CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a843ab89..35d21fa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,10 +29,14 @@ configure_project(TESTS)
add_subdirectory(libevmasm)
add_subdirectory(libsolidity)
add_subdirectory(solc)
+
if (NOT EMSCRIPTEN)
add_subdirectory(liblll)
- add_subdirectory(test)
add_subdirectory(lllc)
endif()
+if (TESTS AND NOT EMSCRIPTEN)
+ add_subdirectory(test)
+endif()
+
# TODO installation and packaging rules