|
 |
20b247 |
--- orc-rel-release-1.6.6/c++/src/orcConfig.cmake.orig 2021-09-02 08:12:02.402411800 -0400
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/c++/src/orcConfig.cmake 2021-09-02 08:11:53.797563660 -0400
|
|
|
20b247 |
@@ -0,0 +1 @@
|
|
|
20b247 |
+include("${CMAKE_CURRENT_LIST_DIR}/orcTargets.cmake")
|
|
|
20b247 |
--- orc-rel-release-1.6.6/c++/src/CMakeLists.txt.orig 2020-12-03 15:46:53.000000000 -0500
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/c++/src/CMakeLists.txt 2021-09-15 14:47:07.195633659 -0400
|
|
|
20b247 |
@@ -227,7 +227,13 @@
|
|
|
20b247 |
add_definitions(-DBUILD_LIBHDFSPP)
|
|
|
20b247 |
endif(BUILD_LIBHDFSPP)
|
|
|
20b247 |
|
|
|
20b247 |
-add_library (orc STATIC ${SOURCE_FILES})
|
|
|
20b247 |
+add_library (orc SHARED ${SOURCE_FILES})
|
|
|
20b247 |
+
|
|
|
20b247 |
+set_target_properties(orc PROPERTIES
|
|
|
20b247 |
+ POSITION_INDEPENDENT_CODE ON
|
|
|
20b247 |
+ VERSION 1.6.6
|
|
|
20b247 |
+ SOVERSION 1
|
|
|
20b247 |
+)
|
|
|
20b247 |
|
|
|
20b247 |
target_link_libraries (orc
|
|
|
20b247 |
protobuf
|
|
|
20b247 |
@@ -238,4 +244,38 @@
|
|
|
20b247 |
${LIBHDFSPP_LIBRARIES}
|
|
|
20b247 |
)
|
|
|
20b247 |
|
|
|
20b247 |
-install(TARGETS orc DESTINATION lib)
|
|
|
20b247 |
+install(TARGETS orc
|
|
|
20b247 |
+ EXPORT orcExports
|
|
|
20b247 |
+ DESTINATION ${LIB_INSTALL_DIR})
|
|
|
20b247 |
+
|
|
|
20b247 |
+include(CMakePackageConfigHelpers)
|
|
|
20b247 |
+write_basic_package_version_file(
|
|
|
20b247 |
+ "${CMAKE_CURRENT_BINARY_DIR}/orcConfigVersion.cmake"
|
|
|
20b247 |
+ VERSION ${orc_VERSION}
|
|
|
20b247 |
+ COMPATIBILITY SameMajorVersion
|
|
|
20b247 |
+ )
|
|
|
20b247 |
+
|
|
|
20b247 |
+# A Package Config file that works from the build directory
|
|
|
20b247 |
+export(EXPORT orcExports
|
|
|
20b247 |
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/orcTargets.cmake"
|
|
|
20b247 |
+ NAMESPACE orc::
|
|
|
20b247 |
+ )
|
|
|
20b247 |
+configure_file(orcConfig.cmake
|
|
|
20b247 |
+ "${CMAKE_CURRENT_BINARY_DIR}/orcConfig.cmake"
|
|
|
20b247 |
+ COPYONLY
|
|
|
20b247 |
+ )
|
|
|
20b247 |
+
|
|
|
20b247 |
+# A Package Config file that works from the installation directory
|
|
|
20b247 |
+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/orc)
|
|
|
20b247 |
+install(EXPORT orcExports
|
|
|
20b247 |
+ FILE orcTargets.cmake
|
|
|
20b247 |
+ NAMESPACE orc::
|
|
|
20b247 |
+ DESTINATION ${ConfigPackageLocation}
|
|
|
20b247 |
+ )
|
|
|
20b247 |
+install(FILES
|
|
|
20b247 |
+ orcConfig.cmake
|
|
|
20b247 |
+ "${CMAKE_CURRENT_BINARY_DIR}/orcConfigVersion.cmake"
|
|
|
20b247 |
+ DESTINATION ${ConfigPackageLocation}
|
|
|
20b247 |
+ )
|
|
|
20b247 |
+
|
|
|
20b247 |
+
|
|
|
20b247 |
--- orc-rel-release-1.6.6/cmake_modules/ThirdpartyToolchain.cmake.orig 2020-12-03 15:46:53.000000000 -0500
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/cmake_modules/ThirdpartyToolchain.cmake 2021-09-15 14:21:07.299584448 -0400
|
|
|
20b247 |
@@ -79,8 +79,8 @@
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR})
|
|
|
20b247 |
-add_library (snappy STATIC IMPORTED)
|
|
|
20b247 |
-set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB})
|
|
|
20b247 |
+add_library (snappy SHARED IMPORTED)
|
|
|
20b247 |
+set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_SHARED_LIB})
|
|
|
20b247 |
|
|
|
20b247 |
if (SNAPPY_VENDORED)
|
|
|
20b247 |
add_dependencies (snappy snappy_ep)
|
|
|
20b247 |
@@ -121,8 +121,8 @@
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
include_directories (SYSTEM ${ZLIB_INCLUDE_DIR})
|
|
|
20b247 |
-add_library (zlib STATIC IMPORTED)
|
|
|
20b247 |
-set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
|
|
|
20b247 |
+add_library (zlib SHARED IMPORTED)
|
|
|
20b247 |
+set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_SHARED_LIB})
|
|
|
20b247 |
|
|
|
20b247 |
if (ZLIB_VENDORED)
|
|
|
20b247 |
add_dependencies (zlib zlib_ep)
|
|
|
20b247 |
@@ -170,8 +170,8 @@
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
include_directories (SYSTEM ${ZSTD_INCLUDE_DIR})
|
|
|
20b247 |
-add_library (zstd STATIC IMPORTED)
|
|
|
20b247 |
-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB})
|
|
|
20b247 |
+add_library (zstd SHARED IMPORTED)
|
|
|
20b247 |
+set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_SHARED_LIB})
|
|
|
20b247 |
|
|
|
20b247 |
if (ZSTD_VENDORED)
|
|
|
20b247 |
add_dependencies (zstd zstd_ep)
|
|
|
20b247 |
@@ -212,8 +212,8 @@
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
include_directories (SYSTEM ${LZ4_INCLUDE_DIR})
|
|
|
20b247 |
-add_library (lz4 STATIC IMPORTED)
|
|
|
20b247 |
-set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB})
|
|
|
20b247 |
+add_library (lz4 SHARED IMPORTED)
|
|
|
20b247 |
+set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_SHARED_LIB})
|
|
|
20b247 |
|
|
|
20b247 |
if (LZ4_VENDORED)
|
|
|
20b247 |
add_dependencies (lz4 lz4_ep)
|
|
|
20b247 |
@@ -327,11 +327,11 @@
|
|
|
20b247 |
|
|
|
20b247 |
include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
|
|
|
20b247 |
|
|
|
20b247 |
-add_library (protobuf STATIC IMPORTED)
|
|
|
20b247 |
-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB})
|
|
|
20b247 |
+add_library (protobuf SHARED IMPORTED)
|
|
|
20b247 |
+set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_SHARED_LIB})
|
|
|
20b247 |
|
|
|
20b247 |
-add_library (protoc STATIC IMPORTED)
|
|
|
20b247 |
-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB})
|
|
|
20b247 |
+add_library (protoc SHARED IMPORTED)
|
|
|
20b247 |
+set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_SHARED_LIB})
|
|
|
20b247 |
|
|
|
20b247 |
if (PROTOBUF_VENDORED)
|
|
|
20b247 |
add_dependencies (protoc protobuf_ep)
|
|
|
20b247 |
--- orc-rel-release-1.6.6/cmake_modules/FindZSTD.cmake.orig 2020-12-03 15:46:53.000000000 -0500
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/cmake_modules/FindZSTD.cmake 2021-09-15 14:10:51.272792107 -0400
|
|
|
20b247 |
@@ -14,7 +14,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
# ZSTD_INCLUDE_DIR: directory containing headers
|
|
|
20b247 |
# ZSTD_LIBS: directory containing zstd libraries
|
|
|
20b247 |
-# ZSTD_STATIC_LIB: path to libzstd.a
|
|
|
20b247 |
+# ZSTD_SHARED_LIB: path to libzstd.a
|
|
|
20b247 |
# ZSTD_FOUND: whether zstd has been found
|
|
|
20b247 |
|
|
|
20b247 |
if( NOT "${ZSTD_HOME}" STREQUAL "")
|
|
|
20b247 |
@@ -23,16 +23,16 @@
|
|
|
20b247 |
|
|
|
20b247 |
message (STATUS "ZSTD_HOME: ${ZSTD_HOME}")
|
|
|
20b247 |
|
|
|
20b247 |
-if (NOT ZSTD_STATIC_LIB_NAME)
|
|
|
20b247 |
- set (ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd)
|
|
|
20b247 |
-endif()
|
|
|
20b247 |
-
|
|
|
20b247 |
find_path (ZSTD_INCLUDE_DIR zstd.h HINTS
|
|
|
20b247 |
${_zstd_path}
|
|
|
20b247 |
NO_DEFAULT_PATH
|
|
|
20b247 |
PATH_SUFFIXES "include")
|
|
|
20b247 |
|
|
|
20b247 |
-find_library (ZSTD_LIBRARIES NAMES ${ZSTD_STATIC_LIB_NAME} HINTS
|
|
|
20b247 |
+if (NOT ZSTD_SHARED_LIB_NAME)
|
|
|
20b247 |
+ set (ZSTD_SHARED_LIB_NAME zstd)
|
|
|
20b247 |
+endif()
|
|
|
20b247 |
+
|
|
|
20b247 |
+find_library (ZSTD_LIBRARIES NAMES ${ZSTD_SHARED_LIB_NAME} HINTS
|
|
|
20b247 |
${_zstd_path}
|
|
|
20b247 |
PATH_SUFFIXES "lib")
|
|
|
20b247 |
|
|
|
20b247 |
@@ -41,14 +41,14 @@
|
|
|
20b247 |
get_filename_component (ZSTD_LIBS ${ZSTD_LIBRARIES} PATH)
|
|
|
20b247 |
set (ZSTD_HEADER_NAME zstd.h)
|
|
|
20b247 |
set (ZSTD_HEADER ${ZSTD_INCLUDE_DIR}/${ZSTD_HEADER_NAME})
|
|
|
20b247 |
- set (ZSTD_STATIC_LIB ${ZSTD_LIBS}/${ZSTD_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (ZSTD_SHARED_LIB ${ZSTD_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZSTD_SHARED_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
else ()
|
|
|
20b247 |
set (ZSTD_FOUND FALSE)
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
if (ZSTD_FOUND)
|
|
|
20b247 |
message (STATUS "Found the zstd header: ${ZSTD_HEADER}")
|
|
|
20b247 |
- message (STATUS "Found the zstd library: ${ZSTD_STATIC_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the zstd library: ${ZSTD_SHARED_LIB}")
|
|
|
20b247 |
else()
|
|
|
20b247 |
if (_ZSTD_path)
|
|
|
20b247 |
set (ZSTD_ERR_MSG "Could not find zstd. Looked in ${_zstd_path}.")
|
|
|
20b247 |
@@ -65,7 +65,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
mark_as_advanced (
|
|
|
20b247 |
ZSTD_INCLUDE_DIR
|
|
|
20b247 |
- ZSTD_STATIC_LIB
|
|
|
20b247 |
+ ZSTD_SHARED_LIB
|
|
|
20b247 |
ZSTD_LIBS
|
|
|
20b247 |
ZSTD_LIBRARIES
|
|
|
20b247 |
)
|
|
|
20b247 |
--- orc-rel-release-1.6.6/cmake_modules/FindSnappy.cmake.orig 2020-12-03 15:46:53.000000000 -0500
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/cmake_modules/FindSnappy.cmake 2021-09-15 13:50:06.714446184 -0400
|
|
|
20b247 |
@@ -14,7 +14,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
# SNAPPY_INCLUDE_DIR: directory containing headers
|
|
|
20b247 |
# SNAPPY_LIBS: directory containing snappy libraries
|
|
|
20b247 |
-# SNAPPY_STATIC_LIB: path to libsnappy.a
|
|
|
20b247 |
+# SNAPPY_SHARED_LIB: path to libsnappy.a
|
|
|
20b247 |
# SNAPPY_FOUND: whether snappy has been found
|
|
|
20b247 |
|
|
|
20b247 |
if( NOT "${SNAPPY_HOME}" STREQUAL "")
|
|
|
20b247 |
@@ -38,14 +38,14 @@
|
|
|
20b247 |
set (SNAPPY_HEADER_NAME snappy.h)
|
|
|
20b247 |
set (SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME})
|
|
|
20b247 |
set (SNAPPY_LIB_NAME snappy)
|
|
|
20b247 |
- set (SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
else ()
|
|
|
20b247 |
set (SNAPPY_FOUND FALSE)
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
if (SNAPPY_FOUND)
|
|
|
20b247 |
message (STATUS "Found the Snappy header: ${SNAPPY_HEADER}")
|
|
|
20b247 |
- message (STATUS "Found the Snappy library: ${SNAPPY_STATIC_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the Snappy library: ${SNAPPY_SHARED_LIB}")
|
|
|
20b247 |
else()
|
|
|
20b247 |
if (_snappy_path)
|
|
|
20b247 |
set (SNAPPY_ERR_MSG "Could not find Snappy. Looked in ${_snappy_path}.")
|
|
|
20b247 |
@@ -62,7 +62,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
mark_as_advanced (
|
|
|
20b247 |
SNAPPY_INCLUDE_DIR
|
|
|
20b247 |
- SNAPPY_STATIC_LIB
|
|
|
20b247 |
+ SNAPPY_SHARED_LIB
|
|
|
20b247 |
SNAPPY_LIBS
|
|
|
20b247 |
SNAPPY_LIBRARIES
|
|
|
20b247 |
)
|
|
|
20b247 |
--- orc-rel-release-1.6.6/cmake_modules/FindLZ4.cmake.orig 2021-09-15 13:52:14.544322930 -0400
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/cmake_modules/FindLZ4.cmake 2021-09-15 13:52:31.791036461 -0400
|
|
|
20b247 |
@@ -14,7 +14,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
# LZ4_INCLUDE_DIR: directory containing headers
|
|
|
20b247 |
# LZ4_LIBS: directory containing LZ4 libraries
|
|
|
20b247 |
-# LZ4_STATIC_LIB: path to lz4.a
|
|
|
20b247 |
+# LZ4_SHARED_LIB: path to lz4.a
|
|
|
20b247 |
# LZ4_FOUND: whether LZ4 has been found
|
|
|
20b247 |
|
|
|
20b247 |
if( NOT "${LZ4_HOME}" STREQUAL "")
|
|
|
20b247 |
@@ -38,14 +38,14 @@
|
|
|
20b247 |
set (LZ4_HEADER_NAME lz4.h)
|
|
|
20b247 |
set (LZ4_HEADER ${LZ4_INCLUDE_DIR}/${LZ4_HEADER_NAME})
|
|
|
20b247 |
set (LZ4_LIB_NAME lz4)
|
|
|
20b247 |
- set (LZ4_STATIC_LIB ${LZ4_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (LZ4_SHARED_LIB ${LZ4_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${LZ4_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
else ()
|
|
|
20b247 |
set (LZ4_FOUND FALSE)
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
if (LZ4_FOUND)
|
|
|
20b247 |
message (STATUS "Found the LZ4 header: ${LZ4_HEADER}")
|
|
|
20b247 |
- message (STATUS "Found the LZ4 library: ${LZ4_STATIC_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the LZ4 library: ${LZ4_SHARED_LIB}")
|
|
|
20b247 |
else()
|
|
|
20b247 |
if (_lz4_path)
|
|
|
20b247 |
set (LZ4_ERR_MSG "Could not find LZ4. Looked in ${_lz4_path}.")
|
|
|
20b247 |
@@ -62,7 +62,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
mark_as_advanced (
|
|
|
20b247 |
LZ4_INCLUDE_DIR
|
|
|
20b247 |
- LZ4_STATIC_LIB
|
|
|
20b247 |
+ LZ4_SHARED_LIB
|
|
|
20b247 |
LZ4_LIBS
|
|
|
20b247 |
LZ4_LIBRARIES
|
|
|
20b247 |
)
|
|
|
20b247 |
--- orc-rel-release-1.6.6/cmake_modules/FindProtobuf.cmake.orig 2021-09-15 14:15:19.726344469 -0400
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/cmake_modules/FindProtobuf.cmake 2021-09-15 14:16:22.330307272 -0400
|
|
|
20b247 |
@@ -15,8 +15,8 @@
|
|
|
20b247 |
# PROTOBUF_FOUND is set if Protobuf is found
|
|
|
20b247 |
# PROTOBUF_INCLUDE_DIR: directory containing headers
|
|
|
20b247 |
# PROTOBUF_LIBS: directory containing Protobuf libraries
|
|
|
20b247 |
-# PROTOBUF_STATIC_LIB: location of protobuf.a
|
|
|
20b247 |
-# PROTOC_STATIC_LIB: location of protoc.a
|
|
|
20b247 |
+# PROTOBUF_SHARED_LIB: location of protobuf.a
|
|
|
20b247 |
+# PROTOC_SHARED_LIB: location of protoc.a
|
|
|
20b247 |
# PROTOBUF_EXECUTABLE: location of protoc
|
|
|
20b247 |
|
|
|
20b247 |
|
|
|
20b247 |
@@ -54,16 +54,16 @@
|
|
|
20b247 |
get_filename_component (PROTOBUF_LIBS ${PROTOBUF_LIBRARY} PATH)
|
|
|
20b247 |
set (PROTOBUF_LIB_NAME protobuf)
|
|
|
20b247 |
set (PROTOC_LIB_NAME protoc)
|
|
|
20b247 |
- set (PROTOBUF_STATIC_LIB ${PROTOBUF_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROTOBUF_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
- set (PROTOC_STATIC_LIB ${PROTOBUF_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROTOC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (PROTOBUF_SHARED_LIB ${PROTOBUF_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${PROTOBUF_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (PROTOC_SHARED_LIB ${PROTOBUF_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${PROTOC_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
else ()
|
|
|
20b247 |
set (PROTOBUF_FOUND FALSE)
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
if (PROTOBUF_FOUND)
|
|
|
20b247 |
message (STATUS "Found the Protobuf headers: ${PROTOBUF_INCLUDE_DIR}")
|
|
|
20b247 |
- message (STATUS "Found the Protobuf library: ${PROTOBUF_STATIC_LIB}")
|
|
|
20b247 |
- message (STATUS "Found the Protoc library: ${PROTOC_STATIC_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the Protobuf library: ${PROTOBUF_SHARED_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the Protoc library: ${PROTOC_SHARED_LIB}")
|
|
|
20b247 |
message (STATUS "Found the Protoc executable: ${PROTOBUF_EXECUTABLE}")
|
|
|
20b247 |
else()
|
|
|
20b247 |
if (_protobuf_path)
|
|
|
20b247 |
@@ -82,6 +82,6 @@
|
|
|
20b247 |
mark_as_advanced (
|
|
|
20b247 |
PROTOBUF_INCLUDE_DIR
|
|
|
20b247 |
PROTOBUF_LIBS
|
|
|
20b247 |
- PROTOBUF_STATIC_LIB
|
|
|
20b247 |
- PROTOC_STATIC_LIB
|
|
|
20b247 |
+ PROTOBUF_SHARED_LIB
|
|
|
20b247 |
+ PROTOC_SHARED_LIB
|
|
|
20b247 |
)
|
|
|
20b247 |
--- orc-rel-release-1.6.6/cmake_modules/FindZLIB.cmake.orig 2021-09-15 14:20:04.485626684 -0400
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/cmake_modules/FindZLIB.cmake 2021-09-15 14:20:33.448146843 -0400
|
|
|
20b247 |
@@ -14,7 +14,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
# ZLIB_INCLUDE_DIR: directory containing headers
|
|
|
20b247 |
# ZLIB_LIBS: directory containing ZLIB libraries
|
|
|
20b247 |
-# ZLIB_STATIC_LIB: path to zlib.a
|
|
|
20b247 |
+# ZLIB_SHARED_LIB: path to zlib.a
|
|
|
20b247 |
# ZLIB_FOUND: whether ZLIB has been found
|
|
|
20b247 |
|
|
|
20b247 |
if( NOT "${ZLIB_HOME}" STREQUAL "")
|
|
|
20b247 |
@@ -28,11 +28,11 @@
|
|
|
20b247 |
NO_DEFAULT_PATH
|
|
|
20b247 |
PATH_SUFFIXES "include")
|
|
|
20b247 |
|
|
|
20b247 |
-if (NOT ZLIB_STATIC_LIB_NAME)
|
|
|
20b247 |
- set (ZLIB_STATIC_LIB_NAME z)
|
|
|
20b247 |
+if (NOT ZLIB_SHARED_LIB_NAME)
|
|
|
20b247 |
+ set (ZLIB_SHARED_LIB_NAME z)
|
|
|
20b247 |
endif()
|
|
|
20b247 |
|
|
|
20b247 |
-find_library (ZLIB_LIBRARIES NAMES ${ZLIB_STATIC_LIB_NAME} HINTS
|
|
|
20b247 |
+find_library (ZLIB_LIBRARIES NAMES ${ZLIB_SHARED_LIB_NAME} HINTS
|
|
|
20b247 |
${_zlib_path}
|
|
|
20b247 |
PATH_SUFFIXES "lib")
|
|
|
20b247 |
|
|
|
20b247 |
@@ -41,14 +41,14 @@
|
|
|
20b247 |
get_filename_component (ZLIB_LIBS ${ZLIB_LIBRARIES} PATH )
|
|
|
20b247 |
set (ZLIB_HEADER_NAME zlib.h)
|
|
|
20b247 |
set (ZLIB_HEADER ${ZLIB_INCLUDE_DIR}/${ZLIB_HEADER_NAME})
|
|
|
20b247 |
- set (ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (ZLIB_SHARED_LIB ${ZLIB_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_SHARED_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
else ()
|
|
|
20b247 |
set (ZLIB_FOUND FALSE)
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
if (ZLIB_FOUND)
|
|
|
20b247 |
message (STATUS "Found the ZLIB header: ${ZLIB_HEADER}")
|
|
|
20b247 |
- message (STATUS "Found the ZLIB library: ${ZLIB_STATIC_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the ZLIB library: ${ZLIB_SHARED_LIB}")
|
|
|
20b247 |
else()
|
|
|
20b247 |
if (_zlib_path)
|
|
|
20b247 |
set (ZLIB_ERR_MSG "Could not find ZLIB. Looked in ${_zlib_path}.")
|
|
|
20b247 |
@@ -65,7 +65,7 @@
|
|
|
20b247 |
|
|
|
20b247 |
mark_as_advanced (
|
|
|
20b247 |
ZLIB_INCLUDE_DIR
|
|
|
20b247 |
- ZLIB_STATIC_LIB
|
|
|
20b247 |
+ ZLIB_SHARED_LIB
|
|
|
20b247 |
ZLIB_LIBS
|
|
|
20b247 |
ZLIB_LIBRARIES
|
|
|
20b247 |
)
|