From abb9f1eed77730da453f978970a31703e5bbe704 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 13 Jan 2020 15:52:46 +0100
Subject: [PATCH] CMake: Renaming devcore static library to solutil (to match
 source code paths)

---
 libevmasm/CMakeLists.txt                 |  2 +-
 liblangutil/CMakeLists.txt               |  2 +-
 liblll/CMakeLists.txt                    |  2 +-
 libsolidity/CMakeLists.txt               |  2 +-
 libsolutil/CMakeLists.txt                | 10 +++++-----
 libyul/CMakeLists.txt                    |  2 +-
 test/CMakeLists.txt                      |  2 +-
 test/tools/yulInterpreter/CMakeLists.txt |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
index 426799385..9ef622f09 100644
--- a/libevmasm/CMakeLists.txt
+++ b/libevmasm/CMakeLists.txt
@@ -36,4 +36,4 @@ set(sources
 )
 
 add_library(evmasm ${sources})
-target_link_libraries(evmasm PUBLIC devcore)
+target_link_libraries(evmasm PUBLIC solutil)
diff --git a/liblangutil/CMakeLists.txt b/liblangutil/CMakeLists.txt
index 63c9de39d..df86476c2 100644
--- a/liblangutil/CMakeLists.txt
+++ b/liblangutil/CMakeLists.txt
@@ -28,4 +28,4 @@ set(sources
 )
 
 add_library(langutil ${sources})
-target_link_libraries(langutil PUBLIC devcore)
+target_link_libraries(langutil PUBLIC solutil)
diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
index c529461b1..a6c8f3a9a 100644
--- a/liblll/CMakeLists.txt
+++ b/liblll/CMakeLists.txt
@@ -11,4 +11,4 @@ set(sources
 )
 
 add_library(lll ${sources})
-target_link_libraries(lll PUBLIC evmasm devcore)
+target_link_libraries(lll PUBLIC evmasm solutil)
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 87eb0e9b7..0a6ba4e58 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -151,7 +151,7 @@ if (NOT (${Z3_FOUND} OR ${CVC4_FOUND}))
 endif()
 
 add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS})
-target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system)
+target_link_libraries(solidity PUBLIC yul evmasm langutil solutil Boost::boost Boost::filesystem Boost::system)
 
 if (${Z3_FOUND})
   target_link_libraries(solidity PUBLIC z3::libz3)
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index 7b4342f12..2c6b6b26f 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -33,11 +33,11 @@ set(sources
 	Whiskers.h
 )
 
-add_library(devcore ${sources})
-target_link_libraries(devcore PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system)
-target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}")
-add_dependencies(devcore solidity_BuildInfo.h)
+add_library(solutil ${sources})
+target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system)
+target_include_directories(solutil PUBLIC "${CMAKE_SOURCE_DIR}")
+add_dependencies(solutil solidity_BuildInfo.h)
 
 if(SOLC_LINK_STATIC)
-	target_link_libraries(devcore PUBLIC Threads::Threads)
+	target_link_libraries(solutil PUBLIC Threads::Threads)
 endif()
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 23aca8bb2..ac766d918 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -158,4 +158,4 @@ add_library(yul
 	optimiser/VarNameCleaner.cpp
 	optimiser/VarNameCleaner.h
 )
-target_link_libraries(yul PUBLIC evmasm devcore langutil)
+target_link_libraries(yul PUBLIC evmasm solutil langutil)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 223cf4e5f..4ce4439e8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -159,7 +159,7 @@ add_executable(soltest ${sources}
     ${libsolidity_sources}
     ${libsolidity_util_sources}
 )
-target_link_libraries(soltest PRIVATE libsolc yul solidity yulInterpreter evmasm devcore Boost::boost Boost::program_options Boost::unit_test_framework evmc)
+target_link_libraries(soltest PRIVATE libsolc yul solidity yulInterpreter evmasm solutil Boost::boost Boost::program_options Boost::unit_test_framework evmc)
 
 
 # Special compilation flag for Visual Studio (version 2019 at least affected)
diff --git a/test/tools/yulInterpreter/CMakeLists.txt b/test/tools/yulInterpreter/CMakeLists.txt
index 95f4c3f3d..d3ddac13d 100644
--- a/test/tools/yulInterpreter/CMakeLists.txt
+++ b/test/tools/yulInterpreter/CMakeLists.txt
@@ -8,4 +8,4 @@ set(sources
 )
 
 add_library(yulInterpreter ${sources})
-target_link_libraries(yulInterpreter PUBLIC yul solidity devcore)
+target_link_libraries(yulInterpreter PUBLIC yul solidity solutil)