Build editline #16
Merged
Build editline #16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TODO: the cmake script is copied from the secp256k1 part in the
same file, may need to review/fix the MSVC and MinGW part.
pmconrad
suggested changes
Mar 6, 2018
CMakeLists.txt
Outdated
|
|
||
| target_include_directories( editline PRIVATE "${EDITLINE_DIR}" PUBLIC "${EDITLINE_DIR}/include" ) | ||
|
|
||
| set( EDITLINE_BUILD_DEFINES |
There was a problem hiding this comment.
Theses defines don't make sense for editline.
CMakeLists.txt
Outdated
| ExternalProject_Add( project_editline | ||
| PREFIX ${CMAKE_CURRENT_BINARY_DIR}/vendor/editline | ||
| SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline | ||
| CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/vendor/editline --with-bignum=no --host=x86_64-w64-mingw32 |
There was a problem hiding this comment.
--with-bignum doesn't make sense for editline
CMakeLists.txt
Outdated
| ExternalProject_Add( project_editline | ||
| PREFIX ${CMAKE_CURRENT_BINARY_DIR}/vendor/editline | ||
| SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline | ||
| CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/vendor/editline --with-bignum=no |
There was a problem hiding this comment.
--with-bignum doesn't make sense for editline
CMakeLists.txt
Outdated
| set(EDITLINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline" ) | ||
| find_package(Editline) | ||
|
|
||
| file(GLOB HEADERS "include/bts/cli/*.hpp") |
There was a problem hiding this comment.
This line looks obsolete, please remove.
CMakeLists.txt
Outdated
| @@ -363,7 +407,7 @@ target_include_directories(fc | |||
| ${OPENSSL_INCLUDE_DIR} | |||
| "vendor/diff-match-patch-cpp-stl" | |||
| ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp | |||
| "${editline_includes}" | |||
| ${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline | |||
There was a problem hiding this comment.
I believe this line is superfluous, because vendor/editline doesn't contain any includes, and vendor/editline/include should have been taken care of by setting INTERFACE_INCLUDE_DIRECTORIES above.
|
@pmconrad Please review again :) |
pmconrad
approved these changes
Mar 7, 2018
|
Didn't test MSVC / MINGW |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More work for bitshares/bitshares-core#673.
TODO: the cmake script is copied from the secp256k1 part in the
same file, may need to review/fix the MSVC and MinGW part.