Browse code

adapt to environment changes

Nat! authored on 13-04-2016 17:50:13
Showing 4 changed files
... ...
@@ -11,3 +11,7 @@ mulle-configuration/
11 11
 .bootstrap.local/
12 12
 dependencies/
13 13
 cityhash/
14
+old/
15
+tmp/
16
+*.dSYM/
17
+*.exe
... ...
@@ -2,20 +2,23 @@ cmake_minimum_required (VERSION 3.0)
2 2
 
3 3
 project (mulle-concurrent)
4 4
 
5
+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/mulle-configuration)
6
+message(STATUS "CMAKE_MODULE_PATH is ${CMAKE_MODULE_PATH}")
7
+message(STATUS "CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
8
+if( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
9
+  include( Debug)
10
+else()
11
+  include( Release)
12
+endif()
5 13
 
6 14
 # using include_directories is a little bit shitty
7 15
 include_directories( src
8 16
 src/hash
9 17
 )
10 18
 
11
-include_directories( SYSTEM
12
-dependencies/include
13
-)
14
-
15
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -DDEBUG ")
16
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -g -DNDEBUG")
17
-
18 19
 set( HEADERS
20
+src/mulle_concurrent.h
21
+src/mulle_concurrent_types.h
19 22
 src/pointerarray/mulle_concurrent_pointerarray.h
20 23
 src/hashmap/mulle_concurrent_hashmap.h
21 24
 )
... ...
@@ -447,7 +447,7 @@ void  *_mulle_concurrent_hashmap_lookup( struct mulle_concurrent_hashmap *map,
447 447
                                          intptr_t hash)
448 448
 {
449 449
    struct _mulle_concurrent_hashmapstorage   *p;
450
-   void                                    *value;
450
+   void                                      *value;
451 451
    
452 452
 retry:
453 453
    p     = _mulle_atomic_pointer_read( &map->storage.pointer);
... ...
@@ -35,18 +35,20 @@
35 35
 #define mulle_concurrent_h__
36 36
 
37 37
 
38
-#define MULLE_CONCURRENT_VERSION  ((0 << 20) | (3 << 8) | 0)
38
+#define MULLE_CONCURRENT_VERSION  ((0 << 20) | (4 << 8) | 0)
39 39
 
40
+#include <mulle_thread/mulle_thread.h>
41
+#include <mulle_allocator/mulle_allocator.h>
40 42
 
41 43
 #include "mulle_concurrent_types.h"
42 44
 #include "mulle_concurrent_hashmap.h"
43 45
 #include "mulle_concurrent_pointerarray.h"
44 46
 
45 47
 
46
-#if MULLE_ALLOCATOR_VERSION < ((1 << 20) | (0 << 8) | 0)
48
+#if MULLE_ALLOCATOR_VERSION < ((1 << 20) | (2 << 8) | 0)
47 49
 # error "mulle_allocator is too old"
48 50
 #endif
49
-#if MULLE_THREAD_VERSION < ((1 << 20) | (0 << 8) | 0)
51
+#if MULLE_THREAD_VERSION < ((2 << 20) | (0 << 8) | 0)
50 52
 # error "mulle_thread is too old"
51 53
 #endif
52 54