Merge branch 'development' into feat-globptr

CMakeExt/Threading.cmake

@@ -24,7 +24,7 @@ if (ENABLE_THREADSUPPORT)
       MESSAGE(FATAL_ERROR "Support for builtin __sync atomics required if "
                           "building with thread support enabled!")
     endif()
-    
+
     # Find support for pthreads
     find_package(Threads REQUIRED)
     set(CMAKE_C_FLAGS

CMakeLists.txt

@@ -220,20 +220,7 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/shared)
 add_subdirectory(dart-if)
 
 # DART base:
-add_subdirectory(dart-impl/base)
-
-# DART implementation of every enabled DART variant:
-if (";${DART_IMPLEMENTATIONS_LIST};" MATCHES ";mpi;")
-  set(DART_IMPLEMENTATION_MPI_ENABLED ON
-      CACHE BOOL INTERNAL FORCE)
-  add_subdirectory(dart-impl/mpi)
-endif()
-
-if (";${DART_IMPLEMENTATIONS_LIST};" MATCHES ";shmem;")
-  set(DART_IMPLEMENTATION_SHMEM_ENABLED ON
-      CACHE BOOL INTERNAL FORCE)
-  add_subdirectory(dart-impl/shmem)
-endif()
+add_subdirectory(dart-impl)
 
 add_subdirectory(dash)
 

dart-impl/CMakeLists.txt

@@ -0,0 +1,28 @@
+
+set(DART_IMPLEMENTATIONS_LIST ${DART_IMPLEMENTATIONS_LIST}
+    PARENT_SCOPE)
+set(ENABLE_THREADSUPPORT ${ENABLE_THREADSUPPORT}
+    PARENT_SCOPE)
+
+if (ENABLE_THREADSUPPORT)
+  set(CMAKE_C_FLAGS
+      "${CMAKE_C_FLAGS} -DDART_ENABLE_THREADSUPPORT")
+  set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -DDART_ENABLE_THREADSUPPORT")
+endif ()
+
+# DART base:
+add_subdirectory(base)
+
+# DART implementation of every enabled DART variant:
+if (";${DART_IMPLEMENTATIONS_LIST};" MATCHES ";mpi;")
+  set(DART_IMPLEMENTATION_MPI_ENABLED ON
+      CACHE BOOL INTERNAL FORCE)
+  add_subdirectory(mpi)
+endif()
+
+if (";${DART_IMPLEMENTATIONS_LIST};" MATCHES ";shmem;")
+  set(DART_IMPLEMENTATION_SHMEM_ENABLED ON
+      CACHE BOOL INTERNAL FORCE)
+  add_subdirectory(shmem)
+endif()

dart-impl/mpi/CMakeLists.txt

@@ -25,8 +25,6 @@ set(ENABLE_UNIFIED_MEMORY_MODEL ${ENABLE_UNIFIED_MEMORY_MODEL}
     PARENT_SCOPE)
 set(ENABLE_SHARED_WINDOWS ${ENABLE_SHARED_WINDOWS}
     PARENT_SCOPE)
-set(ENABLE_THREADSUPPORT ${ENABLE_THREADSUPPORT}
-    PARENT_SCOPE)
 set(ENABLE_DEFAULT_INDEX_TYPE_LONG ${ENABLE_DEFAULT_INDEX_TYPE_LONG}
     PARENT_SCOPE)
 set(ENABLE_SCALAPACK ${ENABLE_SCALAPACK}
@@ -92,11 +90,6 @@ if (ENABLE_UNIFIED_MEMORY_MODEL)
        ${ADDITIONAL_COMPILE_FLAGS} -DDART_MPI_ENABLE_UNIFIED_MEMORY_MODEL)
 endif()
 
-if (ENABLE_THREADSUPPORT)
-  set (ADDITIONAL_COMPILE_FLAGS
-       ${ADDITIONAL_COMPILE_FLAGS} -DDART_ENABLE_THREADSUPPORT)
-endif()
-
 # Features compile flags
 #
 if (PAPI_FOUND AND ENABLE_PAPI)