Revision: 77787
http://sourceforge.net/p/brlcad/code/77787
Author: starseeker
Date: 2020-11-21 17:37:52 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Make a stab at accomidating OpenBSD for zlib build
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/zlib.cmake
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-21 17:30:10 UTC
(rev 77786)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-21 17:37:52 UTC
(rev 77787)
@@ -32,6 +32,11 @@
set(ZLIB_SUFFIX .${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ZLIB_SYMLINK_1 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ZLIB_SYMLINK_2 ${ZLIB_BASENAME}.1${CMAKE_SHARED_LIBRARY_SUFFIX})
+ elseif (OPENBSD)
+ 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)
else (MSVC)
set(ZLIB_BASENAME libz_brl)
set(ZLIB_STATICNAME libz_brl)
@@ -59,7 +64,7 @@
ExternalProject_Target(SHARED zlib ZLIB_BLD ${ZLIB_INSTDIR}
${ZLIB_BASENAME}${ZLIB_SUFFIX}
SYMLINKS "${ZLIB_SYMLINK_1};${ZLIB_SYMLINK_2}"
- LINK_TARGET "${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ LINK_TARGET "${ZLIB_SYMLINK_1}"
RPATH
)
if (BUILD_STATIC_LIBS)
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
