From d15e9a172d9bb537414cdcb95854a46e7c245ded Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Thu, 3 Dec 2015 00:17:35 -0800 Subject: Corrected case for Solidity library entry in CMake file. --- libsolidity/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index fa2f4e9c..77bb9f0e 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -7,7 +7,7 @@ aux_source_directory(formal SRC_LIST) aux_source_directory(interface SRC_LIST) aux_source_directory(parsing SRC_LIST) -set(EXECUTABLE solidity) +set(EXECUTABLE Solidity) file(GLOB HEADERS "*/*.h") -- cgit v1.2.3 From 2a49857ff9990fc451c2c65ade32a3aef8835317 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Thu, 3 Dec 2015 10:15:27 -0800 Subject: Alternative case-consistency fix for libsolidity. Just using fully-qualified scoped name in eh_use instead. --- libsolidity/CMakeLists.txt | 2 +- solc/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 77bb9f0e..fa2f4e9c 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -7,7 +7,7 @@ aux_source_directory(formal SRC_LIST) aux_source_directory(interface SRC_LIST) aux_source_directory(parsing SRC_LIST) -set(EXECUTABLE Solidity) +set(EXECUTABLE solidity) file(GLOB HEADERS "*/*.h") diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index 7dd24627..cb88cb48 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -8,7 +8,7 @@ set(EXECUTABLE solc) file(GLOB HEADERS "*.h") add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED Solidity) +eth_use(${EXECUTABLE} REQUIRED Solidity::solidity) target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES}) if (APPLE) @@ -20,8 +20,8 @@ endif() if (EMSCRIPTEN) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\",\"_compileJSONMulti\"]'") add_executable(soljson jsonCompiler.cpp ${HEADERS}) - eth_use(soljson REQUIRED Solidity) + eth_use(soljson REQUIRED Solidity::solidity) else() add_library(soljson jsonCompiler.cpp ${HEADERS}) - target_link_libraries(soljson solidity) + target_link_libraries(soljson Solidity::solidity) endif() -- cgit v1.2.3 From 40cfcd40d7f699ddf30c647886cd0227b567b4b4 Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Fri, 4 Dec 2015 10:11:09 +0100 Subject: Fix the build - library is not a module The Module::Object rule is something only eth_use() and friends can understand. target_link_libraries() on the other hand needs only the actual library object to link to. --- solc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index cb88cb48..4c26b416 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -23,5 +23,5 @@ if (EMSCRIPTEN) eth_use(soljson REQUIRED Solidity::solidity) else() add_library(soljson jsonCompiler.cpp ${HEADERS}) - target_link_libraries(soljson Solidity::solidity) + target_link_libraries(soljson solidity) endif() -- cgit v1.2.3