early-access version 2853
This commit is contained in:
26
externals/vcpkg/ports/log4cpp/Fix-StaticSupport.patch
vendored
Executable file
26
externals/vcpkg/ports/log4cpp/Fix-StaticSupport.patch
vendored
Executable file
@@ -0,0 +1,26 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 529c18e..beace9e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -21,7 +21,11 @@ SET(LOG4CPP_LIBS)
|
||||
|
||||
IF (WIN32)
|
||||
SET (CMAKE_DEBUG_POSTFIX "d")
|
||||
- LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
|
||||
+ IF (BUILD_SHARED_LIBS)
|
||||
+ LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL )
|
||||
+ ELSE ()
|
||||
+ LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS )
|
||||
+ ENDIF ()
|
||||
ELSE (WIN32)
|
||||
IF (APPLE)
|
||||
# LIST(APPEND LOG4CPP_CFLAGS -DLOG4CPP_HAVE_SSTREAM)
|
||||
@@ -32,7 +36,7 @@ ENDIF (WIN32)
|
||||
|
||||
SET ( LOG4CPP_LIBRARY_NAME "orocos-log4cpp" )
|
||||
|
||||
-ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME} SHARED
|
||||
+ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME}
|
||||
src/Appender.cpp
|
||||
src/AppenderSkeleton.cpp
|
||||
src/AppendersFactory.cpp
|
18
externals/vcpkg/ports/log4cpp/fix-export-targets.patch
vendored
Executable file
18
externals/vcpkg/ports/log4cpp/fix-export-targets.patch
vendored
Executable file
@@ -0,0 +1,18 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 19767a0..59dbf6c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -161,11 +161,13 @@ INSTALL (
|
||||
)
|
||||
|
||||
INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME}
|
||||
+ EXPORT log4cpp-targets
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
RUNTIME DESTINATION bin)
|
||||
|
||||
INSTALL(FILES package.xml DESTINATION share/log4cpp)
|
||||
+INSTALL(EXPORT log4cpp-targets NAMESPACE log4cpp:: DESTINATION share/log4cpp)
|
||||
|
||||
###########################################################
|
||||
# DOCUMENTATION
|
31
externals/vcpkg/ports/log4cpp/fix-includepath.patch
vendored
Executable file
31
externals/vcpkg/ports/log4cpp/fix-includepath.patch
vendored
Executable file
@@ -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}
|
13
externals/vcpkg/ports/log4cpp/fix-install-targets.patch
vendored
Executable file
13
externals/vcpkg/ports/log4cpp/fix-install-targets.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8db2287..529c18e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -159,7 +159,7 @@ INSTALL (
|
||||
INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME}
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
- RUNTIME DESTINATION lib)
|
||||
+ RUNTIME DESTINATION bin)
|
||||
|
||||
INSTALL(FILES package.xml DESTINATION share/log4cpp)
|
||||
|
7
externals/vcpkg/ports/log4cpp/log4cpp-config.in.cmake
vendored
Executable file
7
externals/vcpkg/ports/log4cpp/log4cpp-config.in.cmake
vendored
Executable file
@@ -0,0 +1,7 @@
|
||||
|
||||
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(Threads)
|
||||
endif()
|
||||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/log4cpp-targets.cmake)
|
36
externals/vcpkg/ports/log4cpp/portfile.cmake
vendored
Executable file
36
externals/vcpkg/ports/log4cpp/portfile.cmake
vendored
Executable file
@@ -0,0 +1,36 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO orocos-toolchain/log4cpp
|
||||
REF v2.9.1
|
||||
SHA512 5bd222c820a15c5d96587ac9fe864c3e2dc0fbce8389692be8dd41553ac0308002ad8d6f4ef3ef10af1d796f8ded410788d1a5d22f15505fac639da3f73e3518
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-install-targets.patch
|
||||
Fix-StaticSupport.patch
|
||||
fix-includepath.patch
|
||||
fix-export-targets.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT})
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_LIST_DIR}/log4cpp-config.in.cmake
|
||||
${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cpp-config.cmake
|
||||
@ONLY
|
||||
)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
8
externals/vcpkg/ports/log4cpp/vcpkg.json
vendored
Executable file
8
externals/vcpkg/ports/log4cpp/vcpkg.json
vendored
Executable file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"name": "log4cpp",
|
||||
"version": "2.9.1",
|
||||
"port-version": 7,
|
||||
"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.",
|
||||
"homepage": "https://github.com/orocos-toolchain/log4cpp",
|
||||
"supports": "!uwp"
|
||||
}
|
Reference in New Issue
Block a user