Revision: 77796
http://sourceforge.net/p/brlcad/code/77796
Author: starseeker
Date: 2020-11-21 20:58:36 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Adjust regex logic for OpenBSD
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/regex.cmake
Modified: brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt 2020-11-21
20:30:02 UTC (rev 77795)
+++ brlcad/branches/extbuild/src/other/ext/regex/CMakeLists.txt 2020-11-21
20:58:36 UTC (rev 77796)
@@ -51,6 +51,12 @@
${CMAKE_CURRENT_SOURCE_DIR}
)
+# 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 DEFINED BIN_DIR)
set(BIN_DIR bin)
endif (NOT DEFINED BIN_DIR)
@@ -88,7 +94,11 @@
add_library(regex SHARED ${REGEX_SOURCES})
set_target_properties(regex PROPERTIES OUTPUT_NAME regex_brl)
-set_target_properties(regex PROPERTIES VERSION 1.0.4 SOVERSION 1)
+if (OPENBSD)
+ set_target_properties(regex PROPERTIES VERSION 1.0)
+else (OPENBSD)
+ set_target_properties(regex PROPERTIES VERSION 1.0.4 SOVERSION 1)
+endif (OPENBSD)
if (MSVC)
set_property(TARGET regex APPEND PROPERTY COMPILE_DEFINITIONS
"REGEX_DLL_EXPORTS")
endif (MSVC)
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-21 20:30:02 UTC
(rev 77795)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-21 20:58:36 UTC
(rev 77796)
@@ -26,6 +26,10 @@
set(REGEX_SUFFIX .${REGEX_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(REGEX_SYMLINK_1 ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(REGEX_SYMLINK_2 ${REGEX_BASENAME}.1${CMAKE_SHARED_LIBRARY_SUFFIX})
+ elseif (OPENBSD)
+ set(REGEX_BASENAME libregex_brl)
+ set(REGEX_STATICNAME libregex_brl)
+ set(REGEX_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.1.0)
else (MSVC)
set(REGEX_BASENAME libregex_brl)
set(REGEX_STATICNAME libregex_brl)
@@ -56,7 +60,7 @@
ExternalProject_Target(SHARED regex REGEX_BLD ${REGEX_INSTDIR}
${REGEX_BASENAME}${REGEX_SUFFIX}
SYMLINKS ${REGEX_SYMLINK_1};${REGEX_SYMLINK_2}
- LINK_TARGET ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ LINK_TARGET ${REGEX_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
