Revision: 77789
http://sourceforge.net/p/brlcad/code/77789
Author: starseeker
Date: 2020-11-21 18:10:04 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Apparently OpenBSD is extremely pickly about the library format its ld is
looking for?
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/zlib.cmake
Modified: brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-11-21
17:43:45 UTC (rev 77788)
+++ brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-11-21
18:10:04 UTC (rev 77789)
@@ -177,7 +177,13 @@
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(zlib PROPERTIES SOVERSION 1)
-if(NOT CYGWIN)
+# OpenBSD has its own naming conventions. Set a platform variable based on
+# the OS name so we can test for it succinctly.
+if ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+ set(OPENBSD ON)
+endif ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+
+if(NOT CYGWIN AND NOT OPENBSD)
# This property causes shared libraries on Linux to have the full version
# encoded into their final filename. We disable this on Cygwin because
# it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
@@ -188,6 +194,10 @@
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
endif()
+if (OPENBSD)
+ set_target_properties(zlib PROPERTIES VERSION 1.2)
+endif (OPENBSD)
+
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
if(BUILD_SHARED_LIBS)
install(TARGETS zlib
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-21 17:43:45 UTC
(rev 77788)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-21 18:10:04 UTC
(rev 77789)
@@ -36,7 +36,7 @@
set(ZLIB_BASENAME libz_brl)
set(ZLIB_STATICNAME libz_brl)
set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION})
- set(ZLIB_SYMLINK_1 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1)
+ set(ZLIB_SYMLINK_1 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1.2)
else (MSVC)
set(ZLIB_BASENAME libz_brl)
set(ZLIB_STATICNAME libz_brl)
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
