Revision: 77852
http://sourceforge.net/p/brlcad/code/77852
Author: starseeker
Date: 2020-12-01 17:09:30 +0000 (Tue, 01 Dec 2020)
Log Message:
-----------
Make a stab at simplifying stepcode's versioning, see if we can use the naming
function. Needs to be tested on multiple platforms.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Targets.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-12-01 16:35:55 UTC (rev 77851)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
2020-12-01 17:09:30 UTC (rev 77852)
@@ -42,14 +42,10 @@
# SC version
set(SC_VERSION_MAJOR 0)
-set(SC_VERSION_MINOR 8-dev)
-set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+set(SC_VERSION_MINOR 9)
+set(SC_VERSION_PATCH 1)
+set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})
-# SC ABI version. SC_ABI_SOVERSION should be incremented
-# for each release introducing API incompatibilities
-set(SC_ABI_SOVERSION 2)
-set(SC_ABI_VERSION ${SC_ABI_SOVERSION}.0.0)
-
# Minimum required version of CMake
cmake_minimum_required(VERSION 3.6.3)
cmake_policy(SET CMP0003 NEW)
@@ -65,6 +61,12 @@
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${SC_CMAKE_DIR}")
endif(NOT SC_IS_SUBBUILD)
+# 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.*")
+
# testing and compilation options, build output dirs, install dirs, uninstall,
package creation, etc
include(${SC_CMAKE_DIR}/SC_Build_opts.cmake)
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Targets.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Targets.cmake
2020-12-01 16:35:55 UTC (rev 77851)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Targets.cmake
2020-12-01 17:09:30 UTC (rev 77852)
@@ -46,7 +46,11 @@
if(${_arg_prefix}_SHARED)
add_library(${_addlib_target} SHARED ${${_arg_prefix}_SOURCES})
- set_target_properties(${_addlib_target} PROPERTIES VERSION
${SC_ABI_VERSION} SOVERSION ${SC_ABI_SOVERSION})
+ if(OPENBSD)
+ set_target_properties(${_addlib_target} PROPERTIES VERSION
${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+ else(OPENBSD)
+ set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_VERSION}
SOVERSION ${SC_VERSION_MAJOR})
+ endif(OPENBSD)
if(APPLE)
set_target_properties(${_addlib_target} PROPERTIES LINK_FLAGS
"-flat_namespace -undefined suppress")
endif(APPLE)
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-12-01
16:35:55 UTC (rev 77851)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-12-01
17:09:30 UTC (rev 77852)
@@ -14,15 +14,13 @@
if(BRLCAD_SC_BUILD)
- set(SC_MAJOR_VERSION 2)
- set(SC_MINOR_VERSION 0)
- set(SC_PATCH_VERSION 0)
- 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)
+ set(SC_MAJOR_VERSION 0)
+ set(SC_MINOR_VERSION 9)
+ set(SC_PATCH_VERSION 1)
+ set(SC_VERSION ${SC_MAJOR_VERSION}.${SC_MINOR_VERSION}.${SC_PATCH_VERSION})
+ set_lib_vars(REGEX regex_brl "1" "0" "4")
+
if (MSVC)
set(SC_PREFIX "")
set(SC_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -31,7 +29,7 @@
set(SC_SUFFIX ".${SC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
elseif (OPENBSD)
set(SC_PREFIX "lib")
- set(SC_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}.0.7")
+ set(SC_SUFFIX
"${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_MAJOR_VERSION}.${SC_MINOR_VERSION}")
else (MSVC)
set(SC_PREFIX "lib")
set(SC_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_VERSION}")
@@ -67,34 +65,23 @@
# Tell the parent build about files and libraries
set(STEPCODE_LIBS base express stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
- 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)
+ set_lib_vars(SC ${SCLIB} "${SC_MAJOR_VERSION}" "${SC_MINOR_VERSION}"
"${SC_PATCH_VERSION}")
ExternalProject_Target(SHARED ${SCLIB} STEPCODE_BLD ${STEPCODE_INSTDIR}
- ${SC_PREFIX}${SCLIB}${SC_SUFFIX}
- SYMLINKS ${SYMLINK_1};${SYMLINK_2}
+ ${SC_BASENAME}${SC_SUFFIX}
+ SYMLINKS ${SC_SYMLINK_1};${SC_SYMLINK_2}
LINK_TARGET ${SYMLINK_1}
RPATH
)
endforeach(SCLIB ${STEPCODE_LIBS})
# libexppp is a special naming case, to avoid conflict with the exppp
executable
- 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)
+ set_lib_vars(SC exppp "${SC_MAJOR_VERSION}" "${SC_MINOR_VERSION}"
"${SC_PATCH_VERSION}")
+ if (MSVC)
+ set(SC_BASENAME "libexppp")
+ endif (MSVC)
ExternalProject_Target(SHARED libexppp STEPCODE_BLD ${STEPCODE_INSTDIR}
- libexppp${SC_SUFFIX}
- SYMLINKS ${SYMLINK_1};${SYMLINK_2}
- LINK_TARGET ${SYMLINK_1}
+ ${SC_BASENAME}${SC_SUFFIX}
+ SYMLINKS ${SC_SYMLINK_1};${SC_SYMLINK_2}
+ LINK_TARGET ${SC_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
