Revision: 77574
http://sourceforge.net/p/brlcad/code/77574
Author: starseeker
Date: 2020-10-23 02:23:48 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Pull in zlib CMake changes
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
Removed Paths:
-------------
brlcad/branches/extbuild/src/other/ext/zlib/zlib.map
Modified: brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-10-23
02:17:23 UTC (rev 77573)
+++ brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-10-23
02:23:48 UTC (rev 77574)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.12)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
project(zlib C)
@@ -156,10 +156,6 @@
if(BUILD_STATIC_LIBS)
add_library(zlib-static STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS}
${ZLIB_PRIVATE_HDRS})
set_target_properties(zlib-static PROPERTIES OUTPUT_NAME z_brl)
- if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(zlib-static PROPERTIES PREFIX "lib")
- endif(MSVC)
if(CMAKE_CL_64)
set_target_properties(zlib-static PROPERTIES STATIC_LIBRARY_FLAGS
"/machine:x64")
elseif(MSVC)
@@ -181,18 +177,6 @@
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
endif()
-if(UNIX)
- # On unix-like platforms the library is almost always called libz
- if(NOT APPLE AND BUILD_SHARED_LIBS)
- set_target_properties(zlib PROPERTIES LINK_FLAGS
"-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
- endif()
-elseif(BUILD_SHARED_LIBS AND WIN32)
- # Creates zlib1.dll when building shared library version
- if(BUILD_SHARED_LIBS)
- set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
- endif(BUILD_SHARED_LIBS)
-endif()
-
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
if(BUILD_SHARED_LIBS)
install(TARGETS zlib
Deleted: brlcad/branches/extbuild/src/other/ext/zlib/zlib.map
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib/zlib.map 2020-10-23
02:17:23 UTC (rev 77573)
+++ brlcad/branches/extbuild/src/other/ext/zlib/zlib.map 2020-10-23
02:23:48 UTC (rev 77574)
@@ -1,94 +0,0 @@
-ZLIB_1.2.0 {
- global:
- compressBound;
- deflateBound;
- inflateBack;
- inflateBackEnd;
- inflateBackInit_;
- inflateCopy;
- local:
- deflate_copyright;
- inflate_copyright;
- inflate_fast;
- inflate_table;
- zcalloc;
- zcfree;
- z_errmsg;
- gz_error;
- gz_intmax;
- _*;
-};
-
-ZLIB_1.2.0.2 {
- gzclearerr;
- gzungetc;
- zlibCompileFlags;
-} ZLIB_1.2.0;
-
-ZLIB_1.2.0.8 {
- deflatePrime;
-} ZLIB_1.2.0.2;
-
-ZLIB_1.2.2 {
- adler32_combine;
- crc32_combine;
- deflateSetHeader;
- inflateGetHeader;
-} ZLIB_1.2.0.8;
-
-ZLIB_1.2.2.3 {
- deflateTune;
- gzdirect;
-} ZLIB_1.2.2;
-
-ZLIB_1.2.2.4 {
- inflatePrime;
-} ZLIB_1.2.2.3;
-
-ZLIB_1.2.3.3 {
- adler32_combine64;
- crc32_combine64;
- gzopen64;
- gzseek64;
- gztell64;
- inflateUndermine;
-} ZLIB_1.2.2.4;
-
-ZLIB_1.2.3.4 {
- inflateReset2;
- inflateMark;
-} ZLIB_1.2.3.3;
-
-ZLIB_1.2.3.5 {
- gzbuffer;
- gzoffset;
- gzoffset64;
- gzclose_r;
- gzclose_w;
-} ZLIB_1.2.3.4;
-
-ZLIB_1.2.5.1 {
- deflatePending;
-} ZLIB_1.2.3.5;
-
-ZLIB_1.2.5.2 {
- deflateResetKeep;
- gzgetc_;
- inflateResetKeep;
-} ZLIB_1.2.5.1;
-
-ZLIB_1.2.7.1 {
- inflateGetDictionary;
- gzvprintf;
-} ZLIB_1.2.5.2;
-
-ZLIB_1.2.9 {
- inflateCodesUsed;
- inflateValidate;
- uncompress2;
- gzfread;
- gzfwrite;
- deflateGetDictionary;
- adler32_z;
- crc32_z;
-} ZLIB_1.2.7.1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
