From 6cdfadfa73798c7a87e26b224a92d5e384f9cc2e Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Thu, 20 Dec 2018 09:22:10 +0100 Subject: [PATCH 1/3] fix(cmake): fix the target name of civetweb to be lowercase as upstream --- cmake/FindCivetWeb.cmake | 16 ++++++++-------- pull/CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/FindCivetWeb.cmake b/cmake/FindCivetWeb.cmake index 0854eac3..059c3017 100644 --- a/cmake/FindCivetWeb.cmake +++ b/cmake/FindCivetWeb.cmake @@ -34,22 +34,22 @@ find_package_handle_standard_args(CivetWeb VERSION_VAR CIVETWEB_VERSION_STRING) if(CivetWeb_FOUND) - set(CIVETWEB_LIBRARIES CivetWeb::CivetWeb CivetWeb::CivetWebCpp) + 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() diff --git a/pull/CMakeLists.txt b/pull/CMakeLists.txt index 337e21f3..edca4033 100644 --- a/pull/CMakeLists.txt +++ b/pull/CMakeLists.txt @@ -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) From d6502c22f412b7d1fe57b96a50da22737b393e4e Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Thu, 20 Dec 2018 09:59:07 +0100 Subject: [PATCH 2/3] fix(cmake): correct handle standard args --- cmake/FindCivetWeb.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindCivetWeb.cmake b/cmake/FindCivetWeb.cmake index 059c3017..8a170269 100644 --- a/cmake/FindCivetWeb.cmake +++ b/cmake/FindCivetWeb.cmake @@ -28,12 +28,12 @@ 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) +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) From 103cb8af991b71f85f1d5ce8796ba4c70c19ad6d Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Thu, 20 Dec 2018 10:29:53 +0100 Subject: [PATCH 3/3] fix(cmake): rename findcivetweb module to match find_package --- cmake/{FindCivetWeb.cmake => Findcivetweb.cmake} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cmake/{FindCivetWeb.cmake => Findcivetweb.cmake} (100%) diff --git a/cmake/FindCivetWeb.cmake b/cmake/Findcivetweb.cmake similarity index 100% rename from cmake/FindCivetWeb.cmake rename to cmake/Findcivetweb.cmake