-
Notifications
You must be signed in to change notification settings - Fork 492
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve and clean-up cmake #2325
Conversation
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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}
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, Alexis.
No description provided.