blob: 78177f05e1bbfa9e30f228ce87f158cc7872e0e9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 6a07e64fd13fe35499d9e7b3dbaf968a201652a6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Javier=20Ti=C3=A1?= <javier.tia@gmail.com>
Date: Mon, 1 Feb 2016 06:38:30 -0600
Subject: [PATCH] Set where find and install 32-bits libraries
---
CMakeLists.txt | 2 +-
cmake/Modules/FindPCAP.cmake | 2 +-
src/CMakeLists.txt | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ddffe1..79f40a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,7 @@ CONFIGURE_FILE(
)
# Support for pkg-config
-SET(CMAKE_INSTALL_LIBDIR lib)
+SET(CMAKE_INSTALL_LIBDIR lib32)
SET(pkgconfig_prefix ${CMAKE_INSTALL_PREFIX})
SET(pkgconfig_exec_prefix ${CMAKE_INSTALL_PREFIX})
SET(pkgconfig_libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake
index ecc32fb..c01fa76 100644
--- a/cmake/Modules/FindPCAP.cmake
+++ b/cmake/Modules/FindPCAP.cmake
@@ -29,7 +29,7 @@ find_path(PCAP_INCLUDE_DIR
HINTS ${PCAP_ROOT_DIR}/include
)
-set (HINT_DIR ${PCAP_ROOT_DIR}/lib)
+set (HINT_DIR ${PCAP_ROOT_DIR}/lib32)
# On x64 windows, we should look also for the .lib at /lib/x64/
# as this is the default path for the WinPcap developer's pack
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66b8c50..cfdae02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,7 +75,7 @@ SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIB
INSTALL(
TARGETS tins
EXPORT libtinsTargets
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib32
+ ARCHIVE DESTINATION lib32
COMPONENT dev
)
--
2.7.0
|