Skip to content

fix(cmake): fix the target name of civetweb to be lowercase as upstream #245

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

Merged
merged 3 commits into from
Dec 20, 2018
Merged

fix(cmake): fix the target name of civetweb to be lowercase as upstream #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cdfadf
fix(cmake): fix the target name of civetweb to be lowercase as upstream
gocarlos Dec 20, 2018
d6502c2
fix(cmake): correct handle standard args
gocarlos Dec 20, 2018
103cb8a
fix(cmake): rename findcivetweb module to match find_package
gocarlos Dec 20, 2018
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
22 changes: 11 additions & 11 deletions cmake/FindCivetWeb.cmake → cmake/Findcivetweb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@ if(CIVETWEB_INCLUDE_DIR AND EXISTS "${CIVETWEB_INCLUDE_DIR}/civetweb.h")
endif()

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CivetWeb
FOUND_VAR CivetWeb_FOUND
find_package_handle_standard_args(civetweb
FOUND_VAR civetweb_FOUND
REQUIRED_VARS CIVETWEB_LIBRARY CIVETWEB_CXX_LIBRARY CIVETWEB_INCLUDE_DIR CIVETWEB_CXX_INCLUDE_DIR
VERSION_VAR CIVETWEB_VERSION_STRING)

if(CivetWeb_FOUND)
set(CIVETWEB_LIBRARIES CivetWeb::CivetWeb CivetWeb::CivetWebCpp)
if(civetweb_FOUND)
set(CIVETWEB_LIBRARIES civetweb::civetweb civetweb::civetweb-cpp)
set(CIVETWEB_INCLUDE_DIRS "${CIVETWEB_INCLUDE_DIR}" "${CIVETWEB_CXX_INCLUDE_DIR}")
if(NOT TARGET CivetWeb::CivetWeb)
add_library(CivetWeb::CivetWeb UNKNOWN IMPORTED)
set_target_properties(CivetWeb::CivetWeb PROPERTIES
if(NOT TARGET civetweb::civetweb)
add_library(civetweb::civetweb UNKNOWN IMPORTED)
set_target_properties(civetweb::civetweb PROPERTIES
IMPORTED_LOCATION "${CIVETWEB_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${CIVETWEB_INCLUDE_DIR}"
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
)
endif()
if(NOT TARGET CivetWeb::CivetWebCpp)
add_library(CivetWeb::CivetWebCpp UNKNOWN IMPORTED)
set_target_properties(CivetWeb::CivetWebCpp PROPERTIES
if(NOT TARGET civetweb::civetweb-cpp)
add_library(civetweb::civetweb-cpp UNKNOWN IMPORTED)
set_target_properties(civetweb::civetweb-cpp PROPERTIES
IMPORTED_LOCATION "${CIVETWEB_CXX_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${CIVETWEB_CXX_INCLUDE_DIR}"
IMPORTED_LINK_INTERFACE_LIBRARIES "CivetWeb::CivetWeb"
IMPORTED_LINK_INTERFACE_LIBRARIES "civetweb::civetweb"
IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
)
endif()
Expand Down
2 changes: 1 addition & 1 deletion pull/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
if(USE_THIRDPARTY_LIBRARIES)
find_package(civetweb-3rdparty CONFIG REQUIRED)
else()
find_package(CivetWeb REQUIRED)
find_package(civetweb REQUIRED)
endif()

if(ENABLE_COMPRESSION)
Expand Down