Revision: 77664
http://sourceforge.net/p/brlcad/code/77664
Author: starseeker
Date: 2020-11-02 15:06:50 +0000 (Mon, 02 Nov 2020)
Log Message:
-----------
Gah. Apple uses a different naming convention for library symlinks. Add more
adapters and generalization...
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/bson.cmake
brlcad/branches/extbuild/src/other/ext/png.cmake
brlcad/branches/extbuild/src/other/ext/proj4.cmake
brlcad/branches/extbuild/src/other/ext/regex.cmake
brlcad/branches/extbuild/src/other/ext/stepcode.cmake
brlcad/branches/extbuild/src/other/ext/zlib.cmake
Modified: brlcad/branches/extbuild/src/other/ext/bson.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-02 14:10:29 UTC
(rev 77663)
+++ brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-02 15:06:50 UTC
(rev 77664)
@@ -23,9 +23,18 @@
if (MSVC)
set(BSON_BASENAME bson-1.0)
set(BSON_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(BSON_SYMLINK_1 ${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(BSON_SYMLINK_2
${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION})
+ elseif (APPLE)
+ set(BSON_BASENAME libbson-1.0)
+ set(BSON_SUFFIX .${BSON_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(BSON_SYMLINK_1 ${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(BSON_SYMLINK_2
${BSON_BASENAME}.${BSON_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
else (MSVC)
set(BSON_BASENAME libbson-1.0)
set(BSON_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_VERSION})
+ set(BSON_SYMLINK_1 ${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(BSON_SYMLINK_2
${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION})
endif (MSVC)
ExternalProject_Add(BSON_BLD
@@ -38,7 +47,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED bson BSON_BLD
${BSON_BASENAME}${BSON_SUFFIX}
- SYMLINKS
"${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION}"
+ SYMLINKS ${BSON_SYMLINK_1};${BSON_SYMLINK_2}
LINK_TARGET ${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-02 14:10:29 UTC
(rev 77663)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-02 15:06:50 UTC
(rev 77664)
@@ -31,10 +31,20 @@
set(PNG_BASENAME ${PNG_LIB_NAME})
set(PNG_STATICNAME ${PNG_LIB_NAME}_static)
set(PNG_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PNG_SYMLINK_1 ${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PNG_SYMLINK_2
${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR})
+ elseif (APPLE)
+ set(PNG_BASENAME lib${PNG_LIB_NAME})
+ set(PNG_STATICNAME lib${PNG_LIB_NAME})
+ set(PNG_SUFFIX
.${PNG_VERSION_MAJOR}.${PNG_VERSION_MINOR}.0${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PNG_SYMLINK_1 ${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PNG_SYMLINK_2
${PNG_BASENAME}.${PNG_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX})
else (MSVC)
set(PNG_BASENAME lib${PNG_LIB_NAME})
set(PNG_STATICNAME lib${PNG_LIB_NAME})
set(PNG_SUFFIX
${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR}.${PNG_VERSION_MINOR}.0)
+ set(PNG_SYMLINK_1 ${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PNG_SYMLINK_2
${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR})
endif (MSVC)
set(PNG_DEPS)
@@ -71,7 +81,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED png PNG_BLD ${PNG_INSTDIR}
${PNG_BASENAME}${PNG_SUFFIX}
- SYMLINKS
${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR}
+ SYMLINKS ${PNG_SYMLINK_1};${PNG_SYMLINK_2}
LINK_TARGET ${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-02 14:10:29 UTC
(rev 77663)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-02 15:06:50 UTC
(rev 77664)
@@ -22,9 +22,18 @@
if (MSVC)
set(PROJ_BASENAME proj)
set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_2
${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION})
+ elseif (APPLE)
+ set(PROJ_BASENAME libproj)
+ 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})
else (MSVC)
set(PROJ_BASENAME libproj)
set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION})
+ set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(PROJ_SYMLINK_2
${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION})
endif (MSVC)
set(PROJ4_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/proj-4)
@@ -42,7 +51,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED proj PROJ4_BLD ${PROJ4_INSTDIR}
${PROJ_BASENAME}${PROJ_SUFFIX}
- SYMLINKS
${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION}
+ SYMLINKS ${PROJ_SYMLINK_1};${PROJ_SYMLINK_2}
LINK_TARGET ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-02 14:10:29 UTC
(rev 77663)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-02 15:06:50 UTC
(rev 77664)
@@ -18,10 +18,20 @@
set(REGEX_BASENAME regex_brl)
set(REGEX_STATICNAME regex_brl-static)
set(REGEX_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(REGEX_SYMLINK_1 ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(REGEX_SYMLINK_2 ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1)
+ elseif (APPLE)
+ set(REGEX_BASENAME libregex_brl)
+ set(REGEX_STATICNAME libregex_brl)
+ 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})
else (MSVC)
set(REGEX_BASENAME libregex_brl)
set(REGEX_STATICNAME libregex_brl)
set(REGEX_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${REGEX_VERSION})
+ set(REGEX_SYMLINK_1 ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(REGEX_SYMLINK_2 ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1)
endif (MSVC)
set(REGEX_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/regex)
@@ -42,7 +52,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED regex REGEX_BLD ${REGEX_INSTDIR}
${REGEX_BASENAME}${REGEX_SUFFIX}
- SYMLINKS
${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1
+ SYMLINKS ${REGEX_SYMLINK_1};${REGEX_SYMLINK_2}
LINK_TARGET ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-02
14:10:29 UTC (rev 77663)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-02
15:06:50 UTC (rev 77664)
@@ -22,6 +22,9 @@
if (MSVC)
set(SC_PREFIX "")
set(SC_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ elseif (APPLE)
+ set(SC_PREFIX "lib")
+ set(SC_SUFFIX ".${SC_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
else (MSVC)
set(SC_PREFIX "lib")
set(SC_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}.${SC_VERSION}")
@@ -53,6 +56,13 @@
# Tell the parent build about files and libraries
set(STEPCODE_LIBS base express stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
+ if (APPLE)
+ set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(SYMLINK_2 ${SC_PREFIX}${SCLIB}.2${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else (APPLE)
+ set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(SYMLINK_2 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.2)
+ endif (APPLE)
ExternalProject_Target(SHARED ${SCLIB} STEPCODE_BLD ${STEPCODE_INSTDIR}
${SC_PREFIX}${SCLIB}${SC_SUFFIX}
SYMLINKS
${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX};${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.2
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-02 14:10:29 UTC
(rev 77663)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-02 15:06:50 UTC
(rev 77664)
@@ -24,10 +24,20 @@
set(ZLIB_BASENAME z_brl)
set(ZLIB_STATICNAME z_brl_static)
set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(ZLIB_SYMLINK_1 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(ZLIB_SYMLINK_2 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1)
+ elseif (APPLE)
+ set(ZLIB_BASENAME libz_brl)
+ set(ZLIB_STATICNAME libz_brl)
+ 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})
else (MSVC)
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})
+ set(ZLIB_SYMLINK_2 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1)
endif (MSVC)
set(ZLIB_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/zlib)
@@ -45,7 +55,7 @@
# Tell the parent build about files and libraries
ExternalProject_Target(SHARED zlib ZLIB_BLD ${ZLIB_INSTDIR}
${ZLIB_BASENAME}${ZLIB_SUFFIX}
- SYMLINKS
"${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1"
+ SYMLINKS "${ZLIB_SYMLINK_1};${ZLIB_SYMLINK_2}"
LINK_TARGET "${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
RPATH
)
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
