← Back to branch summary

~ubuntu-branches/ubuntu/trusty/arpon/trusty-proposed

« back to all changes in this revision

Viewing changes to cmake_modules/FindNET.cmake

  • Committer: Package Import Robot
  • Author(s): Daniel T Chen
  • Date: 2014-01-14 14:43:14 UTC
  • Revision ID: package-import@ubuntu.com-20140114144314-1ifae22xhini07x4
Tags: 2.0-2.1ubuntu1
http://bugs.debian.org/718148
https://launchpad.net/bugs/1229530
Handle multiarch libnet1-dev, too, resolving FTBFS.
(Closes: #718148) (LP: #1229530)

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake_modules/FindNET.cmake
16
16
 
17
17
find_library(LIBNET_LIBRARY NAMES ${libnet} PATH ${CMAKE_LIBRARY_PATH})
18
18
 
19
 
if(LIBNET_INCLUDE_DIR AND LIBNET_LIB_DIR AND LIBNET_LIBRARY )
 
19
if(LIBNET_INCLUDE_DIR AND LIBNET_LIBRARY )
20
20
  message(STATUS "Found Libnet.")
21
21
 
22
22
  if(NOT ${INCLUDE_DIR} MATCHES ${LIBNET_INCLUDE_DIR})
24
24
    include_directories(${LIBNET_INCLUDE_DIR})
25
25
  endif(NOT ${INCLUDE_DIR} MATCHES ${LIBNET_INCLUDE_DIR})
26
26
 
27
 
  if(NOT ${LIB_DIR} MATCHES ${LIBNET_LIB_DIR})
 
27
  if(LIBNET_LIB_DIR AND NOT ${LIB_DIR} MATCHES ${LIBNET_LIB_DIR})
28
28
    link_directories(${LIBNET_LIB_DIR})
29
29
    set(LIB_DIR "${LIB_DIR} ${LIBNET_LIB_DIR}")
30
30
  endif(NOT ${LIB_DIR} MATCHES ${LIBNET_LIB_DIR})