kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MFH: r457958

Browse source 
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

Approved by:	ports-secteam (blanket)
This commit is contained in:
Ben Woods 2018-01-03 12:28:45 +00:00
parent 19fbd4b0e9
commit d79ca1d967
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q1/; revision=457959
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt
View file

@ -6,8 +6,8 @@
IF(UNIX) IF(UNIX)
- SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m dl ${RT_LIBRARY}) - SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m dl ${RT_LIBRARY})
- SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_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_LIBRARIES ${LIBMINC_LIBRARIES} m ${CMAKE_DL_LIBS} ${RT_LIBRARY})
+ SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m ${RT_LIBRARY}) + SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m ${CMAKE_DL_LIBS} ${RT_LIBRARY})
ENDIF(UNIX) ENDIF(UNIX)
SET(minc_LIB_SRCS ${minc2_LIB_SRCS} ${minc_common_SRCS}) SET(minc_LIB_SRCS ${minc2_LIB_SRCS} ${minc_common_SRCS})
@ -16,12 +16,12 @@
IF(UNIX) IF(UNIX)
- TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} m dl ) - 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) IF(LIBMINC_BUILD_SHARED_LIBS)
ADD_LIBRARY(${LIBMINC_LIBRARY_STATIC} STATIC ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} ) 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 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) IF(LIBMINC_MINC1_SUPPORT)
TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} ${NETCDF_LIBRARY}) TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} ${NETCDF_LIBRARY})
ENDIF(LIBMINC_MINC1_SUPPORT) ENDIF(LIBMINC_MINC1_SUPPORT)