Improve and clean-up cmake #2325
Open
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
afh
commented
Jan 17, 2024
| @@ -164,7 +162,7 @@ endif() | |||
| cmake_push_check_state() | |||
|
|
|||
| set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ${Boost_INCLUDE_DIRS} ${ICUE_INCLUDE_DIRS}) | |||
| set(CMAKE_REQUIRED_LIBRARIES ${Boost_LIBRARIES} ${ICU_LIBRARIES} ${PROFILE_LIBS}) | |||
| set(CMAKE_REQUIRED_LIBRARIES Boost::regex ${ICU_LIBRARIES} ${PROFILE_LIBS}) | |||
There was a problem hiding this comment.
I'm not exactly sure why the check_cxx_source_runs check following this line fails when ${Boost_LIBRARIES} includes boost_python, yet it does. Given that the check_cxx_source_runs check only includes the <boost/regex/icu.hpp> header, it seems reasonable to only require the boost regex library.
afh
commented
Jan 17, 2024
| @@ -19,7 +24,7 @@ macro(add_ledger_harness_tests _class) | |||
| file(GLOB ${_class}_TESTS *.test) | |||
| foreach(TestFile ${${_class}_TESTS}) | |||
| get_filename_component(TestFile_Name ${TestFile} NAME_WE) | |||
| string(FIND ${TestFile_Name} "_py.test" TestFile_IsPythonTest) | |||
| string(FIND ${TestFile} "_py.test" TestFile_IsPythonTest) | |||
There was a problem hiding this comment.
The TestFile_Name variable contains the _"File name with neither the directory nor the longest extension" (see documentation for get_filename_component), so either the string to search for should be "_py" or the variable to search should be ${TestFile}.
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.
No description provided.