Skip to content
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.

Sign up for GitHub

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

Jump to bottom

cmake/Findasio.cmake and cmake/Findcatch.cmake adapted for usage with… #491

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmake/Findasio.cmake and cmake/Findcatch.cmake adapted for usage with… #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cmake/Findasio.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
find_path( asio_INCLUDE asio.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/asio/asio/include" "/usr/include" "/usr/local/include" "/opt/local/include" )
find_path( asio_INCLUDE asio.hpp HINTS "/usr/include" "/usr/local/include" "/opt/local/include" )

# If the asio library was not found, we try to use the Git subnodule dependency/asio instead.
# Note that "${PROJECT_SOURCE_DIR}/..." does not always work as find_path() hint because these paths are
# relative to the sysroot of the toolchain which could differ from / when using CMake toolchain files.
# Therefore we have to check the existence of the Git submodule with EXISTS which accepts absolute paths.
# See also: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSROOT.html
if ( NOT asio_INCLUDE AND EXISTS "${PROJECT_SOURCE_DIR}/dependency/asio/asio/include/asio.hpp" )
set( asio_INCLUDE "${PROJECT_SOURCE_DIR}/dependency/asio/asio/include" )
endif ( )

if ( asio_INCLUDE )
set( ASIO_FOUND TRUE )
Expand Down
11 changes: 10 additions & 1 deletion cmake/Findcatch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/single_include/catch2" "/usr/include/catch2/single_include" "/usr/include/catch2" "/usr/local/include/catch2/single_include" "/usr/local/include/catch2" "/opt/local/include/catch2/single_include" "/opt/local/include/catch2" )
find_path( catch_INCLUDE catch.hpp HINTS "/usr/include/catch2/single_include" "/usr/include/catch2" "/usr/local/include/catch2/single_include" "/usr/local/include/catch2" "/opt/local/include/catch2/single_include" "/opt/local/include/catch2" )

# If the catch library was not found, we try to use the Git subnodule dependency/catch instead.
# Note that "${PROJECT_SOURCE_DIR}/..." does not always work as find_path() hint because these paths are
# relative to the sysroot of the toolchain which could differ from / when using CMake toolchain files.
# Therefore we have to check the existence of the Git submodule with EXISTS which accepts absolute paths.
# See also: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSROOT.html
if ( NOT catch_INCLUDE AND EXISTS "${PROJECT_SOURCE_DIR}/dependency/catch/single_include/catch2/catch.hpp" )
set( catch_INCLUDE "${PROJECT_SOURCE_DIR}/dependency/catch/single_include/catch2" )
endif ( )

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(catch DEFAULT_MSG catch_INCLUDE)