changes required to compile solidity in a single project

vnvdvc · Sep 1, 2015 · 619c913 · 619c913
1 parent aad59bd
commit 619c913
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0.0)
 
-set(ETH_CMAKE_DIR   "${CMAKE_CURRENT_LIST_DIR}/../cpp-ethereum-cmake"   CACHE PATH "The the path to the cmake directory")
+set(ETH_CMAKE_DIR   "${CMAKE_CURRENT_LIST_DIR}/../cmake"   CACHE PATH "The the path to the cmake directory")
 list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
 
 # Set cmake_policies

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_policy(SET CMP0015 NEW)
-set(CMAKE_AUTOMOC OFF)
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
@@ -12,7 +9,7 @@ file(GLOB HEADERS "*.h")
 include_directories(BEFORE ..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED Eth::devcore Eth::evmasm)
+eth_use(${EXECUTABLE} REQUIRED Dev::devcore Eth::evmasm)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(CMAKE_AUTOMOC OFF)
-
 aux_source_directory(. SRC_LIST)
 list(REMOVE_ITEM SRC_LIST "./jsonCompiler.cpp")