Merge branch 'develop' into feature/value-view-interface

.gitlab/specs.yml

@@ -24,6 +24,7 @@
 .gcc_spectrum:
   variables:
     SPEC: 'gcc@$GCC_VERSION^spectrum-mpi'
+    EXTRA_CMAKE_ARGS: '-DENABLE_DEV_BUILD=On'
 
 .clang_mvapich2:
   variables:

cmake/spheral/SpheralAddLibs.cmake

@@ -224,14 +224,7 @@ function(spheral_add_pybind11_library package_name module_list_name)
 
   # Get the TPL dependencies
   get_property(SPHERAL_BLT_DEPENDS GLOBAL PROPERTY SPHERAL_BLT_DEPENDS)
-  # If building shared libraries, use the SPHERAL_OBJ_LIBS global list
-  # Note, LLNLSpheral has appended any local targets to this list as well
-  if(ENABLE_DEV_BUILD)
-    get_property(SPHERAL_DEPENDS GLOBAL PROPERTY SPHERAL_OBJ_LIBS)
-  else()
-    # Otherwise, provide target names
-    list(APPEND SPHERAL_DEPENDS Spheral_CXX ${${package_name}_DEPENDS})
-  endif()
+  list(APPEND SPHERAL_DEPENDS Spheral_CXX ${${package_name}_DEPENDS})
 
   set(MODULE_NAME Spheral${package_name})
   PYB11Generator_add_module(${package_name}

src/CMakeLists.txt

@@ -79,12 +79,7 @@ endforeach()
 # For dev builds, we must call LLNLSpheralInstallObjs.cmake
 # to ensure LLNLSpheral libraries are added to the Spheral_CXX
 # target
-if(ENABLE_DEV_BUILD)
-  # This calls LLNLSpheralInstallObjs.cmake
-  if(EXISTS ${EXTERNAL_SPHERAL_OBJ_CMAKE})
-    include(${EXTERNAL_SPHERAL_OBJ_CMAKE})
-  endif()
-else()
+if(NOT ENABLE_DEV_BUILD)
   set(CXX_sources spheralCXX.cc)
 endif()
 # Retrieve the global list populated in spheral_obj_add_library
@@ -93,8 +88,6 @@ get_property(SPHERAL_OBJ_LIBS GLOBAL PROPERTY SPHERAL_OBJ_LIBS)
 spheral_add_cxx_library(CXX "${SPHERAL_OBJ_LIBS}")
 
 # This calls LLNLSpheralInstallObjs.cmake
-if(NOT ENABLE_DEV_BUILD)
-  if(EXISTS ${EXTERNAL_SPHERAL_OBJ_CMAKE})
-    include(${EXTERNAL_SPHERAL_OBJ_CMAKE})
-  endif()
+if(EXISTS ${EXTERNAL_SPHERAL_OBJ_CMAKE})
+  include(${EXTERNAL_SPHERAL_OBJ_CMAKE})
 endif()