Revision: 77636
http://sourceforge.net/p/brlcad/code/77636
Author: starseeker
Date: 2020-10-24 14:11:20 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
Don't list the static symlink in the shared entry
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/png.cmake
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-24 14:11:20 UTC
(rev 77636)
@@ -69,7 +69,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};${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SYMLINKS
${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR}
LINK_TARGET ${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
@@ -76,6 +76,7 @@
if (BUILD_STATIC_LIBS)
ExternalProject_Target(STATIC png-static PNG_BLD ${PNG_INSTDIR}
${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SYMLINKS ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
)
endif (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
