aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-09-17 16:34:15 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-09-17 16:34:15 +0800
commit352c196eb37744b8054909a9801d55c672d0eb1c (patch)
treec1b90bd0352b373a898772e4814d3e41912db749
parent9dbe425a5d954dbb67324f6f528e3fc6eb756560 (diff)
parentbda7dbd30a727919b3edbcdb12b5e15f785002be (diff)
downloaddexon-solidity-352c196eb37744b8054909a9801d55c672d0eb1c.tar
dexon-solidity-352c196eb37744b8054909a9801d55c672d0eb1c.tar.gz
dexon-solidity-352c196eb37744b8054909a9801d55c672d0eb1c.tar.bz2
dexon-solidity-352c196eb37744b8054909a9801d55c672d0eb1c.tar.lz
dexon-solidity-352c196eb37744b8054909a9801d55c672d0eb1c.tar.xz
dexon-solidity-352c196eb37744b8054909a9801d55c672d0eb1c.tar.zst
dexon-solidity-352c196eb37744b8054909a9801d55c672d0eb1c.zip
Merge pull request #79 from arkpar/cmake
Per project versioning
-rw-r--r--CMakeLists.txt3
-rw-r--r--libsolidity/Version.cpp2
-rw-r--r--solc/CommandLineInterface.cpp2
3 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c65383ec..48417d95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,7 @@ include(EthExecutableHelper)
include(EthUtils)
include(EthOptions)
-configure_project()
-print_config()
+configure_project(TESTS)
add_subdirectory(libsolidity)
add_subdirectory(solc)
diff --git a/libsolidity/Version.cpp b/libsolidity/Version.cpp
index 61b2e95a..fe140318 100644
--- a/libsolidity/Version.cpp
+++ b/libsolidity/Version.cpp
@@ -22,7 +22,7 @@
#include <libsolidity/Version.h>
#include <string>
-#include <BuildInfo.h>
+#include <solidity/BuildInfo.h>
#include <libdevcore/Common.h>
using namespace dev;
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 3d9c3f08..cfc8a5e0 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -29,7 +29,7 @@
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
-#include "BuildInfo.h"
+#include "solidity/BuildInfo.h"
#include <libdevcore/Common.h>
#include <libdevcore/CommonData.h>
#include <libdevcore/CommonIO.h>