Basic vcpkg integration.

ethereum · aarlt · Mar 25, 2022 · Mar 25, 2022 · Mar 25, 2022 · Mar 25, 2022
commit c296f1664f3912e3e8173f937fc3f0e3c92a1b2c
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/aarlt/vcpkg.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,21 @@
 cmake_minimum_required(VERSION 3.13.0)
 
+#set(vcpkg "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
+#if (NOT CMAKE_TOOLCHAIN_FILE)
+#    if (EXISTS "${vcpkg}")
+#        set(CMAKE_TOOLCHAIN_FILE "${vcpkg}"
+#                CACHE FILEPATH "CMake toolchain file")
+#    else()
+#        set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+#                CACHE FILEPATH "CMake toolchain file")
+#    endif()
+#    message(STATUS "vcpkg toolchain found: ${CMAKE_TOOLCHAIN_FILE}")
+#endif ()
+
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        CACHE FILEPATH "CMake toolchain file")
+message(STATUS "vcpkg toolchain found: ${CMAKE_TOOLCHAIN_FILE}")
+
 set(ETH_CMAKE_DIR   "${CMAKE_CURRENT_LIST_DIR}/cmake"   CACHE PATH "The the path to the cmake directory")
 list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
 
@@ -41,10 +57,9 @@ include(EthCcache)
 
 # Let's find our dependencies
 include(EthDependencies)
-include(fmtlib)
-include(jsoncpp)
-include(range-v3)
-include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
+find_package(fmt CONFIG REQUIRED)
+find_package(jsoncpp CONFIG REQUIRED)
+find_package(range-v3 CONFIG REQUIRED)
 
 find_package(Threads)
 

diff --git a/cmake/FindCLN.cmake b/cmake/FindCLN.cmake
diff --git a/cmake/FindCVC4.cmake b/cmake/FindCVC4.cmake
diff --git a/cmake/FindGMP.cmake b/cmake/FindGMP.cmake
diff --git a/cmake/FindZ3.cmake b/cmake/FindZ3.cmake
diff --git a/cmake/fmtlib.cmake b/cmake/fmtlib.cmake
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
diff --git a/cmake/range-v3.cmake b/cmake/range-v3.cmake
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
@@ -42,7 +42,7 @@ set(sources
 )
 
 add_library(solutil ${sources})
-target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system range-v3)
+target_link_libraries(solutil PRIVATE Boost::boost Boost::filesystem Boost::system range-v3 jsoncpp_static)
 target_include_directories(solutil PUBLIC "${CMAKE_SOURCE_DIR}")
 add_dependencies(solutil solidity_BuildInfo.h)
 

diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
@@ -33,8 +33,8 @@
 using namespace std;
 
 static_assert(
-	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
-	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
+	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 5),
+	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.5."
 );
 
 namespace solidity::util

diff --git a/vcpkg b/vcpkg
diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
+  "name": "solidity",
+  "version": "0.8.13",
+  "dependencies": [
+    "boost-system",
+    "boost-filesystem",
+    "boost-test",
+    "boost-program-options",
+    "boost-multiprecision",
+    "boost-bimap",
+    "boost-assign",
+    "boost-process",
+    "range-v3",
+    "fmt",
+    "jsoncpp",
+    "z3"
+  ]
+}