Correct library usage.

01admin · Aug 8, 2016 · ccd78d0 · ccd78d0
1 parent 226ed7b
commit ccd78d0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/cmake/UseDev.cmake b/cmake/UseDev.cmake
@@ -22,9 +22,9 @@ function(eth_apply TARGET REQUIRED SUBMODULE)
 
 	endif()
 
-	if (${SUBMODULE} STREQUAL "devcore")
+	if (${SUBMODULE} STREQUAL "soldevcore")
 		eth_use(${TARGET} ${REQUIRED} Dev::base)
-		target_link_libraries(${TARGET} devcore)
+		target_link_libraries(${TARGET} soldevcore)
 	endif()
 
 endfunction()
diff --git a/cmake/UseSolidity.cmake b/cmake/UseSolidity.cmake
@@ -25,7 +25,7 @@ function(eth_apply TARGET REQUIRED SUBMODULE)
 	endif()
 
 	if (${SUBMODULE} STREQUAL "solidity" OR ${SUBMODULE} STREQUAL "")
-		eth_use(${TARGET} ${REQUIRED} Dev::devcore Solidity::evmasm)
+		eth_use(${TARGET} ${REQUIRED} Dev::soldevcore Solidity::evmasm)
 		target_link_libraries(${TARGET} ${Solidity_SOLIDITY_LIBRARIES})
 	endif()
 

diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB HEADERS "*.h")
 
 include_directories(BEFORE ..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-eth_use(${EXECUTABLE} REQUIRED Jsoncpp Dev::devcore)
+eth_use(${EXECUTABLE} REQUIRED Jsoncpp Dev::soldevcore)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
@@ -15,7 +15,7 @@ file(GLOB HEADERS "*/*.h")
 include_directories(BEFORE ..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED Dev::devcore Solidity::evmasm)
+eth_use(${EXECUTABLE} REQUIRED Dev::soldevcore Solidity::evmasm)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
@@ -116,7 +116,7 @@ emcmake cmake \
   -DJSONCPP_INCLUDE_DIR="$WORKSPACE"/jsoncpp/include/ \
   -DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \
   -DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \
-  -DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libdevcore.a \
+  -DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libsoldevcore.a \
   -DEth_EVMASM_LIBRARY="$WORKSPACE"/solidity/build/libevmasm/libevmasm.a \
   -DETH_STATIC=1 -DTESTS=0 \
   ..