Browse code

* adapt to mulle-configuration 2.0

Nat! authored on 29/07/2017 19:49:47
Showing 4 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+1
... ...
@@ -54,10 +54,23 @@ ${MULLE_TEST_ALLOCATOR_LIBRARY}
54 54
 ${MULLE_THREAD_LIBRARY}
55 55
 )
56 56
 
57
+set( TARGET_ALL_LOAD_LIBRARIES
58
+$<TARGET_FILE:mulle_concurrent>
59
+${DEPENDENCY_LIBRARIES}
60
+)
61
+
62
+if( FORCE_LOAD)
63
+   set( TMP)
64
+   foreach( library ${TARGET_ALL_LOAD_LIBRARIES})
65
+      list( APPEND TMP "${FORCE_LOAD} ${library}")
66
+   endforeach( library)
67
+   set( TARGET_ALL_LOAD_LIBRARIES ${TMP})
68
+endif()
69
+
70
+
57 71
 TARGET_LINK_LIBRARIES( mulle_concurrent_standalone
58 72
 ${BEGIN_ALL_LOAD}
59
-mulle_concurrent
60
-${DEPENDENCY_LIBRARIES}
73
+${TARGET_ALL_LOAD_LIBRARIES}
61 74
 ${END_ALL_LOAD}
62 75
 )
63 76
 
... ...
@@ -1,3 +1,8 @@
1
+## 1.4.1
2
+
3
+* adapt to mulle-configuration 2.0
4
+
5
+
1 6
 ### 1.3.5
2 7
 
3 8
 * make it a cmake "C" project
... ...
@@ -37,7 +37,7 @@
37 37
 //
38 38
 // community version is always even
39 39
 //
40
-#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (3 << 8) | 5)
40
+#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (4 << 8) | 1)
41 41
 
42 42
 #include <mulle_thread/mulle_thread.h>
43 43
 #include <mulle_allocator/mulle_allocator.h>