Merge pull request #502 from chuckatkins/update-sst-deps

Update sst deps
ornladios · Mar 26, 2018 · 04ca81d · 04ca81d
2 parents 0dabbd1 + fb050aa
commit 04ca81d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/thirdparty/EVPath/EVPath/CMakeLists.txt b/thirdparty/EVPath/EVPath/CMakeLists.txt
@@ -258,19 +258,26 @@ endif()
 set(RUN_IB_TESTS FALSE)
 CHECK_LIBRARY_EXISTS(ibverbs ibv_create_qp "" HAVE_IBVERBS)
 if(HAVE_IBVERBS)
-  message(STATUS "Check for enough rlimit to run IB tests")
-  file(READ "${CMAKE_SOURCE_DIR}/cmake/GOOD_MEMLOCK_LIMIT.c" _SOURCE)
-  CHECK_C_SOURCE_RUNS("${_SOURCE}" GOOD_MEMLOCK_LIMIT)
-  if(GOOD_MEMLOCK_LIMIT)
-    message(STATUS
-      "Check for large enough MEMLOCK rlimit to run IB tests - yes" )
-    set(RUN_IB_TESTS TRUE)
-    set(RUN_NNTI_TESTS FALSE)
-  else()
-    message(STATUS "Check for large enough MEMLOCK rlimit to run IB tests - no")
-    message(WARNING 
-      "Building InfiniBand transport, but current RLIMIT_MEMLOCK value " 
-      "will prevent successful runs.  Not running IB transport tests.")
+  if(BUILD_TESTING)
+    if(NOT CMAKE_CROSSCOMPILING)
+      message(STATUS "Check for enough rlimit to run IB tests")
+      file(READ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/GOOD_MEMLOCK_LIMIT.c" _SOURCE)
+      CHECK_C_SOURCE_RUNS("${_SOURCE}" GOOD_MEMLOCK_LIMIT)
+      if(GOOD_MEMLOCK_LIMIT)
+        message(STATUS
+          "Check for large enough MEMLOCK rlimit to run IB tests - yes" )
+        set(RUN_IB_TESTS TRUE)
+        set(RUN_NNTI_TESTS FALSE)
+      else()
+        message(STATUS "Check for large enough MEMLOCK rlimit to run IB tests - no")
+        message(WARNING 
+          "Building InfiniBand transport, but current RLIMIT_MEMLOCK value " 
+          "will prevent successful runs.  Not running IB transport tests.")
+      endif()
+    else()
+      set(RUN_IB_TESTS TRUE)
+      set(RUN_NNTI_TESTS FALSE)
+    endif()
   endif()
 
   if(EVPATH_TRANSPORT_MODULES)

diff --git a/thirdparty/EVPath/EVPath/mtests/CMakeLists.txt b/thirdparty/EVPath/EVPath/mtests/CMakeLists.txt
@@ -24,9 +24,9 @@ if(MPI_FOUND)
   target_compile_options(mpi_trans_test PRIVATE ${MPI_C_COMPILE_FLAGS})
   target_link_libraries(mpi_trans_test evpath atl::atl ${MPI_C_LIBRARIES})
   target_include_directories(mpi_trans_test PRIVATE ${MPI_C_INCLUDE_PATH})
-  target_compile_defintions(mpi_trans_test PRIVATE BUILD_WITH_MPI=1)
-
+  target_compile_defintion(mpi_trans_test PRIVATE BUILD_WITH_MPI=1)
 endif()
+
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/transport_test.pl
   ${CMAKE_CURRENT_BINARY_DIR}/transport_test.pl

diff --git a/thirdparty/EVPath/update.sh b/thirdparty/EVPath/update.sh
@@ -8,7 +8,7 @@ readonly name="EVPath"
 readonly ownership="EVPath Upstream <robot@adios2>"
 readonly subtree="thirdparty/EVPath/EVPath"
 readonly repo="https://github.com/GTkorvo/EVPath.git"
-readonly tag="adios2"
+readonly tag="master"
 readonly shortlog="true"
 readonly paths="
 "

diff --git a/thirdparty/atl/update.sh b/thirdparty/atl/update.sh
@@ -8,7 +8,7 @@ readonly name="atl"
 readonly ownership="atl Upstream <robot@adios2>"
 readonly subtree="thirdparty/atl/atl"
 readonly repo="https://github.com/GTkorvo/atl.git"
-readonly tag="adios2"
+readonly tag="master"
 readonly shortlog="true"
 readonly paths="
 "

diff --git a/thirdparty/dill/dill/CMakeLists.txt b/thirdparty/dill/dill/CMakeLists.txt
@@ -189,7 +189,7 @@ ENDIF (LIBFFI_FOUND)
 option(DILL_ENABLE_DISASSEMBLY
   "enable binutils-based disassembly (default is OFF)" OFF)
 
-set (ARCHITECTURES sparc powerpc ppc64le virtual x86 x86_64 ia64 arm5 arm6 arm7 arm8)
+set (ARCHITECTURES sparc powerpc ppc64le virtual x86 x86_64 ia64 arm5 arm6 arm8)
 foreach(_arch ${ARCHITECTURES})
   add_custom_command(
     OUTPUT "dill_${_arch}.c"
@@ -215,6 +215,11 @@ elseif(NOT "${NATIVE_ARCH}" STREQUAL "UNSUPPORTED")
   list(APPEND SRC_LIST dill_${ARCH_FILE}.c ${ARCH_FILE}.c ${ARCH_FILE}_rt.c)
 endif()
 
+# The MULTI_TARGET variable is only used to generate the preprocessor symbol
+# in config.h.  Use the DIL_MULTI_CONFIG option variable for all associated
+# logic in the build.
+set(MULTI_TARGET ${DILL_MULTI_TARGET})
+
 if(DILL_MULTI_TARGET OR NATIVE_CG OR EMULATION_POSSIBLE)
     if (EMULATION_POSSIBLE)
 	set (EMU_LIB ${LIBFFI_LIBRARY})

diff --git a/thirdparty/ffs/update.sh b/thirdparty/ffs/update.sh
@@ -8,7 +8,7 @@ readonly name="ffs"
 readonly ownership="ffs Upstream <robot@adios2>"
 readonly subtree="thirdparty/ffs/ffs"
 readonly repo="https://github.com/GTkorvo/ffs.git"
-readonly tag="adios2"
+readonly tag="master"
 readonly shortlog="true"
 readonly paths="
 "