Merge branch 'master' of https://lemma.codes/Lemma

CMake/SuperBuild.cmake

@@ -21,6 +21,7 @@ if (yaml-cpp_FOUND)
     message( STATUS "YAML-CPP was found ${yaml-cpp_FOUND}" )
 else()
     message( STATUS "YAML-CPP WAS NOT FOUND, BUILDING" )
+
     ExternalProject_Add(YAML_CPP
         GIT_REPOSITORY  "https://github.com/jbeder/yaml-cpp.git" 
         GIT_TAG  "yaml-cpp-0.6.2"  # "master" 
@@ -34,6 +35,9 @@ else()
                    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} 
                    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} 
+                   -DCMAKE_CXX_STANDARD=14
+                   -DCMAKE_CXX_STANDARD_REQUIRED=ON
+                   -DCMAKE_CXX_EXTENSIONS=OFF
     )
 endif()
 

CMakeLists.txt

@@ -281,21 +281,25 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 if (LEMMA_USE_OPENMP)
 
     if(APPLE)
-        if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-            set(OpenMP_C "${CMAKE_C_COMPILER}")
-            set(OpenMP_C_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument")
-            set(OpenMP_C_LIB_NAMES "libomp" "libgomp" "libiomp5")
-            set(OpenMP_libomp_LIBRARY ${OpenMP_C_LIB_NAMES})
-            set(OpenMP_libgomp_LIBRARY ${OpenMP_C_LIB_NAMES})
-            set(OpenMP_libiomp5_LIBRARY ${OpenMP_C_LIB_NAMES})
-        endif()
+        #if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+        #    set(OpenMP_C "${CMAKE_C_COMPILER}")
+        #    set(OpenMP_C_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument")
+        #    set(OpenMP_C_LIB_NAMES "libomp" "libgomp" "libiomp5")
+        #    set(OpenMP_libomp_LIBRARY ${OpenMP_C_LIB_NAMES})
+        #    set(OpenMP_libgomp_LIBRARY ${OpenMP_C_LIB_NAMES})
+        #    set(OpenMP_libiomp5_LIBRARY ${OpenMP_C_LIB_NAMES})
+        #endif()
         if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+            find_library( libiomp5 NAMES  libiomp5.dylib PATHS "/anaconda3/lib/" REQUIRED )
             set(OpenMP_CXX "${CMAKE_CXX_COMPILER}")
-            set(OpenMP_CXX_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument")
-            set(OpenMP_CXX_LIB_NAMES "libomp" "libgomp" "libiomp5")
-            set(OpenMP_libomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
-            set(OpenMP_libgomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
-            set(OpenMP_libiomp5_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+            set(OpenMP_CXX_FLAGS "-fopenmp=libiomp5 -Wno-unused-command-line-argument")
+            set(OpenMP_CXX_LIB_NAMES "libiomp5") #"libomp" "libgomp" "libiomp5")
+            #set(OpenMP_libomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+            #set(OpenMP_libgomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+            set(OpenMP_libiomp5_LIBRARY libiomp5 )# ${OpenMP_CXX_LIB_NAMES})
+            set(OpenMP_LIBRARIES  libiomp5)
+            link_directories("/anaconda3/lib")
+    #        find_package(OpenMP REQUIRED)
     #         set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I/usr/local/opt/libomp/include")
     #         " -DOpenMP_CXX_LIB_NAMES=\"omp\" -DOpenMP_omp_LIBRARY=/usr/local/opt/libomp/lib/libomp.dylib ")
     #         set(OpenMP_CXX_LIB_NAMES "omp") # "libgomp" "libiomp5")

Modules/DCIP/CMakeLists.txt

@@ -2,18 +2,20 @@ option ( LEMMA_MODULE_DCIP TRUE )
 
 if (LEMMA_MODULE_DCIP) 
 
-# Configure EMSchur3D 
-set(DCIP_VERSION_MAJOR "0")
-set(DCIP_VERSION_MINOR "0")
-set(DCIP_VERSION_PATCH "1")
-set(DCIP_VERSION "\"${DCIP_VERSION_MAJOR}.${DCIP_VERSION_MINOR}.${DCIP_VERSION_PATCH}\"")
-set(DCIP_VERSION_NOQUOTES "${DCIP_VERSION_MAJOR}.${DCIP_VERSION_MINOR}.${DCIP_VERSION_PATCH}")
-
-configure_file (
+	# Configure DCIP 
+	set(DCIP_VERSION_MAJOR "0")
+	set(DCIP_VERSION_MINOR "0")
+	set(DCIP_VERSION_PATCH "1")
+	set(DCIP_VERSION "\"${DCIP_VERSION_MAJOR}.${DCIP_VERSION_MINOR}.${DCIP_VERSION_PATCH}\"")
+	set(DCIP_VERSION_NOQUOTES "${DCIP_VERSION_MAJOR}.${DCIP_VERSION_MINOR}.${DCIP_VERSION_PATCH}")
+
+
+	configure_file (
 	"${CMAKE_CURRENT_SOURCE_DIR}/config/DCIPConfig.h.in"
 	"${PROJECT_BINARY_DIR}/include/DCIPConfig.h"
 	)
-install ( FILES  ${PROJECT_BINARY_DIR}/include/DCIPConfig.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/ )
+
+	install ( FILES  ${PROJECT_BINARY_DIR}/include/DCIPConfig.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Lemma/ )
 
 	add_subdirectory("src")
 	add_library( dcip ${DCIPSOURCE} )