diff options
| -rw-r--r-- | ports/log4cpp/CONTROL | 3 | ||||
| -rw-r--r-- | ports/log4cpp/fix-includepath.patch | 31 | ||||
| -rw-r--r-- | ports/log4cpp/portfile.cmake | 10 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
4 files changed, 36 insertions, 10 deletions
diff --git a/ports/log4cpp/CONTROL b/ports/log4cpp/CONTROL index ec84f4065..11d3c0207 100644 --- a/ports/log4cpp/CONTROL +++ b/ports/log4cpp/CONTROL @@ -1,5 +1,6 @@ Source: log4cpp -Version: 2.9.1-2 +Version: 2.9.1 +Port-Version: 3 Homepage: https://github.com/orocos-toolchain/log4cpp Description: Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable. Supports: !uwp diff --git a/ports/log4cpp/fix-includepath.patch b/ports/log4cpp/fix-includepath.patch new file mode 100644 index 000000000..2fdac90fe --- /dev/null +++ b/ports/log4cpp/fix-includepath.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index beace9e..c8264ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") + SET(exec_prefix "\${prefix}") + SET(log4cpp_cflags "") + SET(log4cpp_libs "${LOG4CPP_LIBS}") +-SET(includedir "\${prefix}/include/orocos") ++SET(includedir "\${prefix}/include") + SET(libdir "\${prefix}/lib") + CONFIGURE_FILE(log4cpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/orocos-log4cpp.pc @ONLY) + +@@ -147,7 +147,7 @@ INSTALL( + + INSTALL ( + DIRECTORY include/log4cpp +- DESTINATION include/orocos ++ DESTINATION include + PATTERN "config.h.in" EXCLUDE + PATTERN ".svn" EXCLUDE + PATTERN "*.am" EXCLUDE +@@ -157,7 +157,7 @@ INSTALL ( + + INSTALL ( + FILES ${CMAKE_CURRENT_BINARY_DIR}/include/log4cpp/config.h +- DESTINATION include/orocos/log4cpp ++ DESTINATION include/log4cpp + ) + + INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME} diff --git a/ports/log4cpp/portfile.cmake b/ports/log4cpp/portfile.cmake index 44c915876..e8de2c0e3 100644 --- a/ports/log4cpp/portfile.cmake +++ b/ports/log4cpp/portfile.cmake @@ -1,8 +1,4 @@ -include(vcpkg_common_functions) - -if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP.") -endif() +vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -13,6 +9,7 @@ vcpkg_from_github( PATCHES fix-install-targets.patch Fix-StaticSupport.patch + fix-includepath.patch ) vcpkg_configure_cmake( @@ -29,5 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 082003f1c..69f5246c3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -949,8 +949,6 @@ lmdb:arm-uwp=fail lmdb:x64-uwp=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail -log4cpp:arm-uwp=fail -log4cpp:x64-uwp=fail log4cxx:arm64-windows=fail log4cxx:arm-uwp=fail log4cxx:x64-linux=fail |