Browse code

* follow mulle-configuration 3.1 changes and move .travis.yml to trusty

Nat! authored on 18/09/2017 19:24:16
Showing 9 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,21 @@
0
+if( NOT __MULLE_CONCURRENT_CMAKE_DEPENDENCIES_TXT__)
1
+   set( __MULLE_CONCURRENT_CMAKE_DEPENDENCIES_TXT__ ON)
2
+
3
+   message( STATUS "# Include mulle-concurrent CMakeDependencies.txt")
4
+
5
+   include( ${DEPENDENCIES_DIR}/include/mulle_aba/CMakeDependencies.txt)
6
+
7
+   if( NOT MULLE_CONCURRENT_LIBRARY)
8
+      find_library( MULLE_CONCURRENT_LIBRARY NAMES mulle_concurrent)
9
+      message(STATUS "MULLE_CONCURRENT_LIBRARY is ${MULLE_CONCURRENT_LIBRARY}")
10
+      set( C_DEPENDENCY_LIBRARIES
11
+         ${MULLE_CONCURRENT_LIBRARY}
12
+         ${C_DEPENDENCY_LIBRARIES}
13
+         CACHE INTERNAL "need to cache this"
14
+      )
15
+   endif()
16
+
17
+   if( MSVC)
18
+      set( MULLE_CONCURRENT_DEFINITIONS ${MULLE_ABA_DEFINITIONS})
19
+   endif()
20
+endif()
... ...
@@ -11,22 +11,16 @@ else()
11 11
   include( Release)
12 12
 endif()
13 13
 
14
-include( CMakeSourcesAndHeaders.txt)
15
-
16
-find_library( MULLE_ABA_LIBRARY            NAMES mulle_aba)
17
-message( STATUS "MULLE_ABA_LIBRARY is ${MULLE_ABA_LIBRARY}")
18
-find_library( MULLE_ALLOCATOR_LIBRARY      NAMES mulle_allocator)
19
-message( STATUS "MULLE_ALLOCATOR_LIBRARY is ${MULLE_ALLOCATOR_LIBRARY}")
20
-find_library( MULLE_TEST_ALLOCATOR_LIBRARY NAMES mulle_test_allocator)
21
-message( STATUS "MULLE_TEST_ALLOCATOR_LIBRARY is ${MULLE_TEST_ALLOCATOR_LIBRARY}")
22
-find_library( MULLE_THREAD_LIBRARY         NAMES mulle_thread)
23
-message( STATUS "MULLE_THREAD_LIBRARY is ${MULLE_THREAD_LIBRARY}")
24 14
 
15
+set( MULLE_CONCURRENT_LIBRARY ON)
16
+include( CMakeSourcesAndHeaders.txt)
17
+include( CMakeDependencies.txt)
25 18
 
26
-if( MSVC)
27
-   add_definitions( -DMULLE_ALLOCATOR_EXTERN_GLOBAL=extern)
28
-endif()
29 19
 
20
+set( PUBLIC_HEADERS
21
+${HEADERS}
22
+CMakeDependencies.txt
23
+)
30 24
 
31 25
 set( DEPENDENCY_LIBRARIES
32 26
 ${MULLE_ABA_LIBRARY}
... ...
@@ -44,14 +38,15 @@ ${SOURCES}
44 44
 
45 45
 set( STANDALONE_BASE_NAME "mulle_concurrent")
46 46
 set( STANDALONE_NAME "mulle_concurrent_standalone")
47
-
48
-set( TARGET_ALL_LOAD_LIBRARIES
47
+set( STANDALONE_DEFINITIONS ${MULLE_CONCURRENT_DEFINITIONS})
48
+set( STANDALONE_ALL_LOAD_LIBRARIES
49 49
 $<TARGET_FILE:mulle_concurrent>
50 50
 ${DEPENDENCY_LIBRARIES}
51 51
 )
52 52
 
53
+
53 54
 include( Standalone)
54 55
 
55 56
 
56 57
 INSTALL( TARGETS mulle_concurrent_standalone mulle_concurrent DESTINATION "lib")
57
-INSTALL( FILES ${HEADERS} DESTINATION "include/mulle_concurrent")
58
+INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION "include/mulle_concurrent")
... ...
@@ -1,4 +1,4 @@
1
-[comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/README.md.scion")
1
+<!-- [comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/README.md.scion") ->
2 2
 # mulle-concurrent
3 3
 
4 4
 **mulle-concurrent** is a library for lock- and wait-free data structures.
... ...
@@ -1,3 +1,7 @@
1
+### 1.4.5
2
+
3
+* follow mulle-configuration 3.1 changes and move .travis.yml to trusty
4
+
1 5
 ### 1.4.3
2 6
 
3 7
 * Various small improvements
... ...
@@ -1,4 +1,4 @@
1
-[comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/dox/BUILD.md.scion")
1
+<!-- [comment]: <> (DO NOT EDIT THIS FILE. EDIT THE TEMPLATE "templates/dox/BUILD.md.scion") ->
2 2
 # How to build mulle-concurrent
3 3
 
4 4
 
... ...
@@ -217,7 +217,7 @@
217 217
 				417C026B1BD8404E005A3751 /* StaticLibraryOSX.xcconfig */,
218 218
 				417C026C1BD8404E005A3751 /* ToolOSX.xcconfig */,
219 219
 			);
220
-			path = "mulle-configuration";
220
+			path = "mulle-configuration/xcode";
221 221
 			sourceTree = "<group>";
222 222
 		};
223 223
 		41CAEAE21C8D9F23003C2C7B /* Libraries */ = {
... ...
@@ -37,7 +37,7 @@
37 37
 //
38 38
 // community version is always even
39 39
 //
40
-#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (4 << 8) | 3)
40
+#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (4 << 8) | 5)
41 41
 
42 42
 #include <mulle_thread/mulle_thread.h>
43 43
 #include <mulle_allocator/mulle_allocator.h>
44 44
new file mode 100644
... ...
@@ -0,0 +1,2 @@
0
+<!-- [comment]: <> ({{COMMENT}}) ->
1
+{% includes TEMPLATE_FILE %}
0 2
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-[comment]: <> ({{COMMENT}})
2
-{% includes TEMPLATE_FILE %}