Skip to content

Commit

Permalink
deactivate special windows exernal lib handling
Browse files Browse the repository at this point in the history
  • Loading branch information
cguentherTUChemnitz committed Oct 14, 2022
1 parent 4db5019 commit aecf7bf
Showing 1 changed file with 20 additions and 13 deletions.
33 changes: 20 additions & 13 deletions recipes/qpdf/all/patches/0001-libqpdf-cmake-deps-jpeg-zlib.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt
index 7053e205..f09c36c4 100644
index 7053e205..9f5962f7 100644
--- a/libqpdf/CMakeLists.txt
+++ b/libqpdf/CMakeLists.txt
@@ -128,7 +128,6 @@ include(CheckSymbolExists)
@@ -128,13 +128,8 @@ include(CheckSymbolExists)
set(dep_include_directories)
set(dep_link_directories)
set(dep_link_libraries)
-set(ANYTHING_MISSING 0)

if(WIN32 AND (EXISTS ${qpdf_SOURCE_DIR}/external-libs))
set(EXTERNAL_LIBS 1)
@@ -161,9 +160,6 @@ if(NOT EXTERNAL_LIBS)
-if(WIN32 AND (EXISTS ${qpdf_SOURCE_DIR}/external-libs))
- set(EXTERNAL_LIBS 1)
-else()
- set(EXTERNAL_LIBS 0)
-endif()
+set(EXTERNAL_LIBS 0)

if(EXTERNAL_LIBS)
set(EXTLIBDIR ${qpdf_SOURCE_DIR}/external-libs)
@@ -161,9 +156,6 @@ if(NOT EXTERNAL_LIBS)
if(ZLIB_H_PATH AND ZLIB_LIB_PATH)
list(APPEND dep_include_directories ${ZLIB_H_PATH})
list(APPEND dep_link_libraries ${ZLIB_LIB_PATH})
Expand All @@ -20,7 +27,7 @@ index 7053e205..f09c36c4 100644
endif()
endif()
endif()
@@ -182,9 +178,6 @@ if(NOT EXTERNAL_LIBS)
@@ -182,9 +174,6 @@ if(NOT EXTERNAL_LIBS)
list(APPEND dep_include_directories ${LIBJPEG_H_PATH})
list(APPEND dep_link_libraries ${LIBJPEG_LIB_PATH})
set(JPEG_INCLUDE ${LIBJPEG_H_PATH})
Expand All @@ -30,7 +37,7 @@ index 7053e205..f09c36c4 100644
endif()
endif()
endif()
@@ -220,9 +213,6 @@ if(USE_IMPLICIT_CRYPTO OR REQUIRE_CRYPTO_OPENSSL)
@@ -220,9 +209,6 @@ if(USE_IMPLICIT_CRYPTO OR REQUIRE_CRYPTO_OPENSSL)
list(APPEND dep_link_libraries ${OPENSSL_LIB_PATH})
set(USE_CRYPTO_OPENSSL ON)
set(FOUND_CRYPTO ON)
Expand All @@ -40,7 +47,7 @@ index 7053e205..f09c36c4 100644
endif()
endif()
endif()
@@ -241,9 +231,6 @@ if(USE_IMPLICIT_CRYPTO OR REQUIRE_CRYPTO_GNUTLS)
@@ -241,9 +227,6 @@ if(USE_IMPLICIT_CRYPTO OR REQUIRE_CRYPTO_GNUTLS)
list(APPEND dep_link_libraries ${GNUTLS_LIB_PATH})
set(USE_CRYPTO_GNUTLS ON)
set(FOUND_CRYPTO ON)
Expand All @@ -50,7 +57,7 @@ index 7053e205..f09c36c4 100644
endif()
endif()
endif()
@@ -268,14 +255,9 @@ if(FOUND_CRYPTO)
@@ -268,14 +251,9 @@ if(FOUND_CRYPTO)
set(DEFAULT_CRYPTO "native")
endif()
endif()
Expand All @@ -66,7 +73,7 @@ index 7053e205..f09c36c4 100644
message(STATUS "")
message(STATUS "*** Crypto Summary ***")
message(STATUS " GNU TLS crypto enabled: " ${USE_CRYPTO_GNUTLS})
@@ -403,6 +385,10 @@ endif()
@@ -403,6 +381,10 @@ endif()
# use PIC for the object library so we don't have to compile twice.
set(OBJECT_LIB libqpdf_object)
add_library(${OBJECT_LIB} OBJECT ${libqpdf_SOURCES})
Expand All @@ -77,7 +84,7 @@ index 7053e205..f09c36c4 100644
if(OBJECT_LIB_IS_PIC)
target_compile_definitions(${OBJECT_LIB} PRIVATE libqpdf_EXPORTS)
endif()
@@ -498,8 +484,6 @@ if(BUILD_SHARED_LIBS)
@@ -498,8 +480,6 @@ if(BUILD_SHARED_LIBS)
PUBLIC
$<BUILD_INTERFACE:${qpdf_INCLUDE}>
$<INSTALL_INTERFACE:include>)
Expand All @@ -86,7 +93,7 @@ index 7053e205..f09c36c4 100644
if(ATOMIC_LIBRARY)
target_link_libraries(${SHARED_LIB} PRIVATE ${ATOMIC_LIBRARY})
endif()
@@ -507,6 +491,8 @@ if(BUILD_SHARED_LIBS)
@@ -507,6 +487,8 @@ if(BUILD_SHARED_LIBS)
target_link_options(${SHARED_LIB} PRIVATE ${LD_VERSION_FLAGS})
endif()

Expand All @@ -95,7 +102,7 @@ index 7053e205..f09c36c4 100644
target_include_directories(${SHARED_LIB}
PRIVATE ${qpdf_SOURCE_DIR}/libqpdf ${CMAKE_CURRENT_BINARY_DIR})

@@ -544,6 +530,8 @@ if(BUILD_STATIC_LIBS)
@@ -544,6 +526,8 @@ if(BUILD_STATIC_LIBS)
target_link_libraries(${STATIC_LIB} INTERFACE ${ATOMIC_LIBRARY})
endif()

Expand Down

0 comments on commit aecf7bf

Please sign in to comment.