svn commit: r457958 - head/science/InsightToolkit/files
Ben Woods
woodsb02 at FreeBSD.org
Wed Jan 3 12:26:40 UTC 2018
Author: woodsb02
Date: Wed Jan 3 12:26:39 2018
New Revision: 457958
URL: https://svnweb.freebsd.org/changeset/ports/457958
Log:
science/InsightToolkit: Modify patch to use ${CMAKE_DL_LIBS}
${CMAKE_DL_LIBS} expands to "" on FreeBSD where the dl functions are
included in the Standard C library (libc), but to "dl" on operating
systems where the dl functions are part of libdl.
This change to the patch does not result in a change in contents of the
resulting package.
Reported by: jbeich
Modified:
head/science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt
Modified: head/science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt
==============================================================================
--- head/science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt Wed Jan 3 12:10:39 2018 (r457957)
+++ head/science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt Wed Jan 3 12:26:39 2018 (r457958)
@@ -6,8 +6,8 @@
IF(UNIX)
- SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m dl ${RT_LIBRARY})
- SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m dl ${RT_LIBRARY})
-+ SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m ${RT_LIBRARY})
-+ SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m ${RT_LIBRARY})
++ SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m ${CMAKE_DL_LIBS} ${RT_LIBRARY})
++ SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m ${CMAKE_DL_LIBS} ${RT_LIBRARY})
ENDIF(UNIX)
SET(minc_LIB_SRCS ${minc2_LIB_SRCS} ${minc_common_SRCS})
@@ -16,12 +16,12 @@
IF(UNIX)
- TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} m dl )
-+ TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} m )
++ TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} m ${CMAKE_DL_LIBS} )
IF(LIBMINC_BUILD_SHARED_LIBS)
ADD_LIBRARY(${LIBMINC_LIBRARY_STATIC} STATIC ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
- TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY} ${RT_LIBRARY} m dl )
-+ TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY} ${RT_LIBRARY} m )
++ TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY} ${RT_LIBRARY} m ${CMAKE_DL_LIBS} )
IF(LIBMINC_MINC1_SUPPORT)
TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} ${NETCDF_LIBRARY})
ENDIF(LIBMINC_MINC1_SUPPORT)
More information about the svn-ports-head
mailing list