Revision: 77799
http://sourceforge.net/p/brlcad/code/77799
Author: starseeker
Date: 2020-11-21 22:38:46 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Make a stab at updating stepcode logic for OpenBSD
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Utils.cmake
brlcad/branches/extbuild/src/other/ext/stepcode.cmake
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
2020-11-21 22:10:44 UTC (rev 77798)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
2020-11-21 22:38:46 UTC (rev 77799)
@@ -50,6 +50,12 @@
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.*")
+
# SC version
SET(SC_VERSION_MAJOR 0)
if(NOT SC_IS_SUBBUILD)
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Utils.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Utils.cmake
2020-11-21 22:10:44 UTC (rev 77798)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Utils.cmake
2020-11-21 22:38:46 UTC (rev 77799)
@@ -99,7 +99,11 @@
target_link_libraries(${libname} ${libslist})
DEFINE_DLL_IMPORTS(${libname} "${libslist}" )
endif(NOT "${libs}" MATCHES "NONE")
- SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION ${SC_ABI_VERSION}
SOVERSION ${SC_ABI_SOVERSION} )
+ if(OPENBSD)
+ SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION ${SC_VERSION} )
+ else(OPENBSD)
+ SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION ${SC_ABI_VERSION}
SOVERSION ${SC_ABI_SOVERSION} )
+ endif(OPENBSD)
if(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
install(TARGETS ${libname}
RUNTIME DESTINATION ${BIN_DIR}
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-21
22:10:44 UTC (rev 77798)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-21
22:38:46 UTC (rev 77799)
@@ -17,7 +17,11 @@
set(SC_MAJOR_VERSION 2)
set(SC_MINOR_VERSION 0)
set(SC_PATCH_VERSION 0)
- set(SC_VERSION ${SC_MAJOR_VERSION}.${SC_MINOR_VERSION}.${SC_PATCH_VERSION})
+ if (OPENBSD)
+ set(SC_VERSION ${SC_MAJOR_VERSION}.${SC_MINOR_VERSION})
+ else (OPENBSD)
+ set(SC_VERSION ${SC_MAJOR_VERSION}.${SC_MINOR_VERSION}.${SC_PATCH_VERSION})
+ endif (OPENBSD)
if (MSVC)
set(SC_PREFIX "")
@@ -59,30 +63,34 @@
# Tell the parent build about files and libraries
set(STEPCODE_LIBS base express stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
- set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
- if (APPLE)
- set(SYMLINK_2
${SC_PREFIX}${SCLIB}.${SC_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
- else (APPLE)
- set(SYMLINK_2
${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_MAJOR_VERSION})
- endif (APPLE)
+ if (NOT OPENBSD)
+ set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ if (APPLE)
+ set(SYMLINK_2
${SC_PREFIX}${SCLIB}.${SC_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else (APPLE)
+ set(SYMLINK_2
${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_MAJOR_VERSION})
+ endif (APPLE)
+ endif (NOT OPENBSD)
ExternalProject_Target(SHARED ${SCLIB} STEPCODE_BLD ${STEPCODE_INSTDIR}
${SC_PREFIX}${SCLIB}${SC_SUFFIX}
SYMLINKS ${SYMLINK_1};${SYMLINK_2}
- LINK_TARGET ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ LINK_TARGET ${SYMLINK_1}
RPATH
)
endforeach(SCLIB ${STEPCODE_LIBS})
# libexppp is a special naming case, to avoid conflict with the exppp
executable
- set(SYMLINK_1 libexppp${CMAKE_SHARED_LIBRARY_SUFFIX})
- if (APPLE)
- set(SYMLINK_2 libexppp.${SC_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
- else (APPLE)
- set(SYMLINK_2 libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_MAJOR_VERSION})
- endif (APPLE)
+ if (NOT OPENBSD)
+ set(SYMLINK_1 libexppp${CMAKE_SHARED_LIBRARY_SUFFIX})
+ if (APPLE)
+ set(SYMLINK_2 libexppp.${SC_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else (APPLE)
+ set(SYMLINK_2 libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_MAJOR_VERSION})
+ endif (APPLE)
+ endif (NOT OPENBSD)
ExternalProject_Target(SHARED libexppp STEPCODE_BLD ${STEPCODE_INSTDIR}
libexppp${SC_SUFFIX}
SYMLINKS ${SYMLINK_1};${SYMLINK_2}
- LINK_TARGET libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}
+ LINK_TARGET ${SYMLINK_1}
RPATH
)
set(STEPCODE_EXECS check-express exppp exp2cxx)
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
