Alternative case-consistency fix for libsolidity. Just using fully-qualified scoped name in eh_use instead.

This commit is contained in:
Bob Summerwill 2015-12-03 10:15:27 -08:00
parent d15e9a172d
commit 2a49857ff9
2 changed files with 4 additions and 4 deletions

View File

@ -7,7 +7,7 @@ aux_source_directory(formal SRC_LIST)
aux_source_directory(interface SRC_LIST) aux_source_directory(interface SRC_LIST)
aux_source_directory(parsing SRC_LIST) aux_source_directory(parsing SRC_LIST)
set(EXECUTABLE Solidity) set(EXECUTABLE solidity)
file(GLOB HEADERS "*/*.h") file(GLOB HEADERS "*/*.h")

View File

@ -8,7 +8,7 @@ set(EXECUTABLE solc)
file(GLOB HEADERS "*.h") file(GLOB HEADERS "*.h")
add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) 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}) target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
if (APPLE) if (APPLE)
@ -20,8 +20,8 @@ endif()
if (EMSCRIPTEN) if (EMSCRIPTEN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\",\"_compileJSONMulti\"]'") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\",\"_compileJSONMulti\"]'")
add_executable(soljson jsonCompiler.cpp ${HEADERS}) add_executable(soljson jsonCompiler.cpp ${HEADERS})
eth_use(soljson REQUIRED Solidity) eth_use(soljson REQUIRED Solidity::solidity)
else() else()
add_library(soljson jsonCompiler.cpp ${HEADERS}) add_library(soljson jsonCompiler.cpp ${HEADERS})
target_link_libraries(soljson solidity) target_link_libraries(soljson Solidity::solidity)
endif() endif()