Skip to content

Commit 8c5ecd1

Browse files
committed
Fix incorrectly CMAKE_BINARY_DIR usage
Similiar to CMAKE_SOURCE_DIR. Using CMAKE_BINARY_DIR will put the generated header (stdlib.h) in build/include/solidity/libstdlib but it should start with build/third-party/solidity or the library can't find the header. Signed-off-by: Jun Zhang <[email protected]>
1 parent 74a38fc commit 8c5ecd1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

cmake/fmtlib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include(FetchContent)
22

33
FetchContent_Declare(
44
fmtlib
5-
PREFIX "${CMAKE_BINARY_DIR}/deps"
5+
PREFIX "${PROJECT_BINARY_DIR}/deps"
66
DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
77
DOWNLOAD_NAME fmt-8.0.1.tar.gz
88
URL https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz

cmake/jsoncpp.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ else()
66
set(JSONCPP_CMAKE_COMMAND ${CMAKE_COMMAND})
77
endif()
88

9-
set(prefix "${CMAKE_BINARY_DIR}/deps")
9+
set(prefix "${PROJECT_BINARY_DIR}/deps")
1010
set(JSONCPP_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}")
1111
set(JSONCPP_INCLUDE_DIR "${prefix}/include")
1212

cmake/range-v3.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ else()
66
set(RANGE_V3_CMAKE_COMMAND ${CMAKE_COMMAND})
77
endif()
88

9-
set(prefix "${CMAKE_BINARY_DIR}/deps")
9+
set(prefix "${PROJECT_BINARY_DIR}/deps")
1010
set(RANGE_V3_INCLUDE_DIR "${prefix}/include")
1111

1212
ExternalProject_Add(range-v3-project

libstdlib/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ foreach(src IN LISTS STDLIB)
1111
string(REGEX REPLACE ";" ",\n\t0x" STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
1212
set(STDLIB_FILE_CONTENT "0x${STDLIB_FILE_CONTENT}")
1313
set(STDLIB_FILE_NAME ${src})
14-
configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
15-
list(APPEND GENERATED_STDLIB_HEADERS ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h)
14+
configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
15+
list(APPEND GENERATED_STDLIB_HEADERS ${PROJECT_BINARY_DIR}/include/libstdlib/${src}.h)
1616
endforeach()
1717

18-
configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)
18+
configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)

0 commit comments

Comments
 (0)