blob: 5b1c60eb6a9c7a40bad4ba93afceb2eb5795d1b0 (
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
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1d631e..e95d7fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,10 +16,10 @@ set (VERSION 1.5.0)
add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
if (WIN32)
- set (BINDIR .)
- set (SBINDIR .)
+ set (BINDIR bin)
+ set (SBINDIR bin)
set (SYSCONFDIR .)
- set (LIBDIR .)
+ set (LIBDIR lib)
set (INCLUDEDIR include)
set (DATAROOTDIR share)
set (MANDIR man)
@@ -90,7 +90,7 @@ endif (${DOCUMENTATION} STREQUAL ON)
# Install config file
# ========================================
-install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}")
+#install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}")
# ========================================
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 272b60a..c180067 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -104,7 +104,7 @@ set_target_properties(libmosquitto PROPERTIES
SOVERSION 1
)
-install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}")
if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
add_library(libmosquitto_static STATIC ${C_SRC})
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 5e4f08e..a8cc6be 100644
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -13,7 +13,7 @@ set_target_properties(mosquittopp PROPERTIES
VERSION ${VERSION}
SOVERSION 1
)
-install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}")
if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
add_library(mosquittopp_static STATIC
|
