From 80371e2d25ce3eb868d6f75b99a54af9dc6c1583 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Wed, 14 Nov 2018 17:15:39 +0100
Subject: Ensure liblangutil is compiled and linked as its own static library.

---
 CMakeLists.txt             | 1 +
 liblangutil/CMakeLists.txt | 6 ++++++
 libsolidity/CMakeLists.txt | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 liblangutil/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86769672..ed51e5a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ include(EthOptions)
 configure_project(TESTS)
 
 add_subdirectory(libdevcore)
+add_subdirectory(liblangutil)
 add_subdirectory(libevmasm)
 add_subdirectory(libsolidity)
 add_subdirectory(libsolc)
diff --git a/liblangutil/CMakeLists.txt b/liblangutil/CMakeLists.txt
new file mode 100644
index 00000000..722ca840
--- /dev/null
+++ b/liblangutil/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Solidity Commons Library (Solidity related sharing bits between libsolidity and libyul)
+file(GLOB sources "*.cpp")
+file(GLOB headers "*.h")
+
+add_library(langutil ${sources} ${headers})
+target_link_libraries(langutil PUBLIC devcore)
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 5f261f64..c57fca16 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Until we have a clear separation, libyul has to be included here
-file(GLOB_RECURSE sources "*.cpp" "../libyul/*.cpp" "../liblangutil/*.cpp")
-file(GLOB_RECURSE headers "*.h" "../libyul/*.h" "../liblangutil/*.h")
+file(GLOB_RECURSE sources "*.cpp" "../libyul/*.cpp")
+file(GLOB_RECURSE headers "*.h" "../libyul/*.h")
 
 find_package(Z3 QUIET)
 if (${Z3_FOUND})
@@ -26,7 +26,7 @@ if (NOT (${Z3_FOUND} OR ${CVC4_FOUND}))
 endif()
 
 add_library(solidity ${sources} ${headers})
-target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+target_link_libraries(solidity PUBLIC evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 
 if (${Z3_FOUND})
   target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
-- 
cgit