Browse code

modernize cmake

Nat! authored on 08/10/2017 15:47:32
Showing 4 changed files
... ...
@@ -16,6 +16,8 @@ set( MULLE_CONCURRENT_LIBRARY ON)
16 16
 include( CMakeSourcesAndHeaders.txt)
17 17
 include( CMakeDependencies.txt)
18 18
 
19
+include_directories( ${INCLUDE_DIRS})
20
+
19 21
 
20 22
 set( PUBLIC_HEADERS
21 23
 ${HEADERS}
... ...
@@ -36,14 +38,11 @@ add_library( mulle_concurrent
36 36
 ${SOURCES}
37 37
 )
38 38
 
39
-
40
-target_compile_definitions( mulle_concurrent
41
-PRIVATE ${MULLE_CONCURRENT_DEFINITIONS}
42
-)
43
-
39
+target_compile_definitions( mulle_concurrent PRIVATE ${MULLE_CONCURRENT_DEFINITIONS})
44 40
 
45 41
 set( STANDALONE_BASE_NAME "mulle_concurrent")
46 42
 set( STANDALONE_NAME "mulle_concurrent_standalone")
43
+set( STANDALONE_SOURCES "src/mulle_concurrent_standalone.c")
47 44
 set( STANDALONE_DEFINITIONS ${MULLE_CONCURRENT_DEFINITIONS})
48 45
 set( STANDALONE_ALL_LOAD_LIBRARIES
49 46
 $<TARGET_FILE:mulle_concurrent>
... ...
@@ -53,7 +52,6 @@ ${DEPENDENCY_LIBRARIES}
53 53
 
54 54
 include( Standalone)
55 55
 
56
-
57 56
 INSTALL( TARGETS mulle_concurrent_standalone mulle_concurrent DESTINATION "lib")
58 57
 INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION "include/mulle_concurrent")
59 58
 
... ...
@@ -1,5 +1,6 @@
1 1
 # using include_directories is a little bit shitty
2
-include_directories( src
2
+set( INCLUDE_DIRS
3
+src
3 4
 src/hashmap
4 5
 src/pointerarray
5 6
 )
... ...
@@ -1,3 +1,7 @@
1
+### 1.4.11
2
+
3
+* Various small improvements
4
+
1 5
 ### 1.4.9
2 6
 
3 7
 * support new mulle-tests
... ...
@@ -37,7 +37,7 @@
37 37
 //
38 38
 // community version is always even
39 39
 //
40
-#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (4 << 8) | 9)
40
+#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (4 << 8) | 11)
41 41
 
42 42
 #include <mulle_thread/mulle_thread.h>
43 43
 #include <mulle_allocator/mulle_allocator.h>