diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-01-30 05:52:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 13:52:30 -0800 |
| commit | 5e329f0bd3e6eb08ab6a470546ae5a062fb2846f (patch) | |
| tree | c515845f57eefd8312ed4ea4ac1fb625a9fce6f4 | |
| parent | b5b21df60a76c064b3a2e383ace56d47300e2b63 (diff) | |
| download | vcpkg-5e329f0bd3e6eb08ab6a470546ae5a062fb2846f.tar.gz vcpkg-5e329f0bd3e6eb08ab6a470546ae5a062fb2846f.zip | |
[loguru] Update to 2.1.0 and extend to generate proper binary on non-windows (#8682)
* [loguru] extend to generate proper binary on linux
* Update the changes
* Update CMakeLists.txt
* Remove CMAKE_CXX_LINK_FLAGS
* Add find_dependency(Threads) to config file
| -rw-r--r-- | ports/loguru/CMakeLists.txt | 48 | ||||
| -rw-r--r-- | ports/loguru/CONTROL | 4 | ||||
| -rw-r--r-- | ports/loguru/loguruConfig.cmake.in | 9 | ||||
| -rw-r--r-- | ports/loguru/portfile.cmake | 29 |
4 files changed, 82 insertions, 8 deletions
diff --git a/ports/loguru/CMakeLists.txt b/ports/loguru/CMakeLists.txt new file mode 100644 index 000000000..3688e1121 --- /dev/null +++ b/ports/loguru/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.12)
+
+project(loguru CXX)
+set(CMAKE_CXX_STANDARD 11)
+
+option(INSTALL_HEADERS "Install header files" ON)
+
+set(loguru_headers
+ loguru.hpp
+)
+set(loguru_sources
+ loguru.cpp
+)
+
+add_library(loguru ${loguru_sources})
+target_include_directories(loguru PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:include/loguru>)
+
+if(UNIX)
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ target_link_libraries(loguru PUBLIC Threads::Threads ${CMAKE_DL_LIBS})
+endif()
+
+set(LOGURU_INCLUDE_INSTALL_DIR include/loguru CACHE PATH "Install directory for headers")
+if(INSTALL_HEADERS)
+ install(FILES ${loguru_headers} DESTINATION ${LOGURU_INCLUDE_INSTALL_DIR})
+endif()
+
+set(INCLUDE_INSTALL_DIR ${LOGURU_INCLUDE_INSTALL_DIR})
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(loguruConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/loguruConfig.cmake
+ INSTALL_DESTINATION share/loguru
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ PATH_VARS INCLUDE_INSTALL_DIR)
+
+install(TARGETS loguru
+ EXPORT loguruTargets
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/loguruConfig.cmake DESTINATION share/loguru)
+install(EXPORT loguruTargets DESTINATION share/loguru)
diff --git a/ports/loguru/CONTROL b/ports/loguru/CONTROL index baa9503b0..056f08529 100644 --- a/ports/loguru/CONTROL +++ b/ports/loguru/CONTROL @@ -1,4 +1,4 @@ Source: loguru -Version: v2.0.0 +Version: v2.1.0 +Homepage: https://github.com/emilk/loguru Description: A lightweight and flexible C++ logging library -Build-Depends:
\ No newline at end of file diff --git a/ports/loguru/loguruConfig.cmake.in b/ports/loguru/loguruConfig.cmake.in new file mode 100644 index 000000000..b75b189e0 --- /dev/null +++ b/ports/loguru/loguruConfig.cmake.in @@ -0,0 +1,9 @@ +@PACKAGE_INIT@
+
+if(UNIX)
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
+endif()
+
+set_and_check(loguru_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+include("${CMAKE_CURRENT_LIST_DIR}/loguruTargets.cmake")
diff --git a/ports/loguru/portfile.cmake b/ports/loguru/portfile.cmake index 80efb0eea..3019c85a3 100644 --- a/ports/loguru/portfile.cmake +++ b/ports/loguru/portfile.cmake @@ -1,12 +1,29 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emilk/loguru - REF v2.0.0 - SHA512 d6358f843689d10a44dc7bf590305cbfb89727e26d971ca4fe439e5468cdb7bcee2aa858368250e9654fb5ecebf63bca9742451881dae78068fecb18f279d988 + REF 9c2fea0d4530657f23259be4132f8101c98b579e #v2.1.0 + SHA512 49eebf8648f9d29273af76dca0a4e49155daa3664e98979df005e64eb0fa9f4eeb4228245327d469772c51076571acbe39a644eba531444d8676d9709a7e3914 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/loguru.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru) -file(COPY ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/loguru)
\ No newline at end of file +if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL ${SOURCE_PATH}/loguru.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru) +endif() + +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) + configure_file(${CMAKE_CURRENT_LIST_DIR}/loguruConfig.cmake.in ${SOURCE_PATH}/loguruConfig.cmake.in COPYONLY) + + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF + ) + + vcpkg_install_cmake() + vcpkg_fixup_cmake_targets() + vcpkg_copy_pdbs() +endif() + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) |
