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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
Description: some changes in cmake-files
Index: libstxxl-1.4.1/CMakeLists.txt
===================================================================
--- libstxxl-1.4.1.orig/CMakeLists.txt 2015-05-15 00:00:18.184048978 +0200
+++ libstxxl-1.4.1/CMakeLists.txt 2015-05-15 00:00:18.180048978 +0200
@@ -29,10 +29,10 @@
endif()
# default to Debug building for single-config generators
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+#if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message("Defaulting CMAKE_BUILD_TYPE to Debug")
set(CMAKE_BUILD_TYPE "Debug")
-endif()
+#endif()
# STXXL version string
set(STXXL_VERSION_MAJOR "1")
@@ -59,6 +59,9 @@
endif()
endif()
+#Disable RPATH
+set(CMAKE_SKIP_RPATH 1)
+
###############################################################################
# compilation options
@@ -103,8 +106,8 @@
# by default we currently only build a static library, since we do not aim to
# keep a stable binary interface.
-option(BUILD_STATIC_LIBS "Build static library version of libstxxl" ON)
-option(BUILD_SHARED_LIBS "Build shared library version of libstxxl" OFF)
+option(BUILD_STATIC_LIBS "Build static library version of libstxxl" OFF)
+option(BUILD_SHARED_LIBS "Build shared library version of libstxxl" ON)
### allow user to specify other installation paths
Index: libstxxl-1.4.1/lib/CMakeLists.txt
===================================================================
--- libstxxl-1.4.1.orig/lib/CMakeLists.txt 2015-05-15 00:00:18.184048978 +0200
+++ libstxxl-1.4.1/lib/CMakeLists.txt 2015-05-15 00:00:18.180048978 +0200
@@ -72,17 +72,19 @@
set(STXXL_EXPORTED_LIBS stxxl)
# we name debug library builds "stxxl_debug" and release builds "stxxl"
-string(TOLOWER "stxxl_${CMAKE_BUILD_TYPE}" STXXL_LIBNAME)
-if(STXXL_LIBNAME STREQUAL "stxxl_release" OR STXXL_LIBNAME STREQUAL "stxxl_")
+#string(TOLOWER "stxxl_${CMAKE_BUILD_TYPE}" STXXL_LIBNAME)
+#if(STXXL_LIBNAME STREQUAL "stxxl_release" OR STXXL_LIBNAME STREQUAL "stxxl_")
set(STXXL_LIBNAME "stxxl")
-endif()
+#endif()
if(BUILD_SHARED_LIBS)
# build stxxl SHARED library and link all programs again it
add_library(stxxl SHARED ${LIBSTXXL_SOURCES})
- set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}")
- set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}")
+ set_target_properties(stxxl PROPERTIES
+ OUTPUT_NAME "${STXXL_LIBNAME}"
+ VERSION "${STXXL_VERSION_STRING}"
+ SOVERSION 1)
install(TARGETS stxxl
EXPORT stxxl-targets
ARCHIVE DESTINATION ${INSTALL_LIB_DIR}
|
