Revision: 77794
http://sourceforge.net/p/brlcad/code/77794
Author: starseeker
Date: 2020-11-21 20:14:49 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
More OpenBSD experimenting
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/proj-4/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/proj-4/src/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/proj4.cmake
brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/other/ext/proj-4/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj-4/CMakeLists.txt
2020-11-21 20:07:31 UTC (rev 77793)
+++ brlcad/branches/extbuild/src/other/ext/proj-4/CMakeLists.txt
2020-11-21 20:14:49 UTC (rev 77794)
@@ -21,17 +21,28 @@
cmake_policy(SET CMP0087 OLD)
endif (POLICY CMP0087)
+
+# 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.*")
+
#################################################################################
set(PROJ_VERSION_MAJOR 4)
set(PROJ_VERSION_MINOR 9)
set(PROJ_VERSION_PATCH 3)
-set(PROJ_VERSION
${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH})
+if (OPENBSD)
+ set(PROJ_VERSION ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR})
+else (OPENBSD)
+ set(PROJ_VERSION
${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH})
+ set(PROJ_API_VERSION "12")
+ set(PROJ_BUILD_VERSION
"${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_API_VERSION}")
+endif (OPENBSD)
set(VERSION ${PROJ_VERSION})
if(WIN32)
set(PROJ_ABI_VERSION "${PROJ_VERSION_MAJOR}_${PROJ_VERSION_MINOR}")
endif(WIN32)
-set(PROJ_API_VERSION "12")
-set(PROJ_BUILD_VERSION
"${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_API_VERSION}")
#################################################################################
if(NOT BIN_DIR)
Modified: brlcad/branches/extbuild/src/other/ext/proj-4/src/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj-4/src/CMakeLists.txt
2020-11-21 20:07:31 UTC (rev 77793)
+++ brlcad/branches/extbuild/src/other/ext/proj-4/src/CMakeLists.txt
2020-11-21 20:14:49 UTC (rev 77794)
@@ -201,7 +201,11 @@
if (BUILD_SHARED_LIBS)
add_library(proj SHARED ${all_srcs} ${hdr_files})
- set_target_properties(proj PROPERTIES VERSION "${PROJ_BUILD_VERSION}"
SOVERSION "${PROJ_API_VERSION}")
+ if (OPENBSD)
+ set_target_properties(proj PROPERTIES VERSION "${PROJ_VERSION}")
+ else (OPENBSD)
+ set_target_properties(proj PROPERTIES VERSION "${PROJ_BUILD_VERSION}"
SOVERSION "${PROJ_API_VERSION}")
+ endif (OPENBSD)
set_target_properties(proj PROPERTIES LINKER_LANGUAGE C)
set(proj_libs ${M_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
if(proj_libs)
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-21 20:07:31 UTC
(rev 77793)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-21 20:14:49 UTC
(rev 77794)
@@ -29,6 +29,9 @@
set(PROJ_SUFFIX .${PROJ_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(PROJ_SYMLINK_2
${PROJ_BASENAME}.${PROJ_API_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ elseif (OPENBSD)
+ set(PROJ_BASENAME libproj)
+ set(PROJ_SUFFIX
${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_MAJOR_VERSION}.${PROJ_MINOR_VERSION})
else (MSVC)
set(PROJ_BASENAME libproj)
set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION})
@@ -55,7 +58,7 @@
ExternalProject_Target(SHARED proj PROJ4_BLD ${PROJ4_INSTDIR}
${PROJ_BASENAME}${PROJ_SUFFIX}
SYMLINKS ${PROJ_SYMLINK_1};${PROJ_SYMLINK_2}
- LINK_TARGET ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ LINK_TARGET ${PROJ_SYMLINK_1}
RPATH
)
Modified: brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-11-21
20:07:31 UTC (rev 77793)
+++ brlcad/branches/extbuild/src/other/ext/zlib/CMakeLists.txt 2020-11-21
20:14:49 UTC (rev 77794)
@@ -175,7 +175,6 @@
endif(BUILD_STATIC_LIBS)
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-set_target_properties(zlib PROPERTIES SOVERSION 1)
# OpenBSD has its own naming conventions. Set a platform variable based on
# the OS name so we can test for it succinctly.
@@ -192,6 +191,8 @@
# This has no effect with MSVC, on that platform the version info for
# the DLL comes from the resource file win32/zlib1.rc
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
endif()
if (OPENBSD)
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
