Skip to content

Commit 9c0b870

Browse files
committed
CMake: small tweaks and fixes
1 parent 141c157 commit 9c0b870

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

CMakeLists.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ eth_policy()
3636
# project name and version should be set after cmake_policy CMP0048
3737
project(cpp-ethereum VERSION "1.3.0")
3838

39+
if (NOT EXISTS ${CMAKE_SOURCE_DIR}/evmjit/.git)
40+
message(FATAL_ERROR "Git submodules not initialized, execute:\n git submodule update --init")
41+
endif()
42+
3943
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY On)
4044

4145
include(EthOptions)
@@ -49,9 +53,7 @@ include(ProjectCryptopp)
4953
include(ProjectJsonCpp)
5054
include(ProjectJsonRpcCpp)
5155

52-
if (NOT EXISTS ${CMAKE_SOURCE_DIR}/.git)
53-
message(FATAL_ERROR "Git submodules not initialized, execute:\n git submodule update --init")
54-
endif()
56+
5557

5658
configure_project(CPUID CURL EVMJIT FATDB MINIUPNPC ROCKSDB PARANOID TESTS VMTRACE)
5759

cmake/ProjectCryptopp.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ ExternalProject_Add(cryptopp
164164
-DBUILD_SHARED=Off
165165
-DBUILD_TESTING=Off
166166
LOG_CONFIGURE 1
167-
# Overwtire build and install commands to force Release build on MSVC.
167+
# Overwrite build and install commands to force Release build on MSVC.
168168
BUILD_COMMAND cmake --build <BINARY_DIR> --config Release
169169
INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install
170170
LOG_INSTALL 1

cmake/ProjectJsonCpp.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ExternalProject_Add(jsoncpp
1919
-DJSONCPP_WITH_TESTS=Off
2020
-DJSONCPP_WITH_PKGCONFIG_SUPPORT=Off
2121
LOG_CONFIGURE 1
22-
# Overwtire build and install commands to force Release build on MSVC.
22+
# Overwrite build and install commands to force Release build on MSVC.
2323
BUILD_COMMAND cmake --build <BINARY_DIR> --config Release
2424
INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install
2525
LOG_INSTALL 1

cmake/ProjectJsonRpcCpp.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ExternalProject_Add(jsonrpccpp
4747
PATCH_COMMAND cmake -E make_directory <SOURCE_DIR>/win32-deps/include
4848
CMAKE_ARGS ${CMAKE_ARGS}
4949
LOG_CONFIGURE 1
50-
# Overwtire build and install commands to force Release build on MSVC.
50+
# Overwrite build and install commands to force Release build on MSVC.
5151
BUILD_COMMAND cmake --build <BINARY_DIR> --config Release
5252
INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install
5353
LOG_INSTALL 1

0 commit comments

Comments
 (0)