Browse code

Merge branch 'master' of mulle-kybernetik.com:/home/nat/public_git/repositories/mulle-concurrent

Nat! authored on 11/09/2017 13:24:27
Showing 1 changed files
... ...
@@ -2,7 +2,6 @@ cmake_minimum_required( VERSION 3.0)
2 2
 
3 3
 project( mulle-concurrent C)
4 4
 
5
-
6 5
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/mulle-configuration/cmake)
7 6
 message( STATUS "CMAKE_MODULE_PATH is ${CMAKE_MODULE_PATH}")
8 7
 message( STATUS "CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
... ...
@@ -23,6 +22,12 @@ message( STATUS "MULLE_TEST_ALLOCATOR_LIBRARY is ${MULLE_TEST_ALLOCATOR_LIBRARY}
23 23
 find_library( MULLE_THREAD_LIBRARY         NAMES mulle_thread)
24 24
 message( STATUS "MULLE_THREAD_LIBRARY is ${MULLE_THREAD_LIBRARY}")
25 25
 
26
+
27
+if( MSVC)
28
+   add_definitions( -DMULLE_ALLOCATOR_EXTERN_GLOBAL=extern)
29
+endif()
30
+
31
+
26 32
 set( DEPENDENCY_LIBRARIES
27 33
 ${MULLE_ABA_LIBRARY}
28 34
 ${MULLE_ALLOCATOR_LIBRARY}