Merge branch 'ckelly_develop' of https://github.com/CODARcode/PerformanceAnalysis into ckelly_develop

Author: giltirn

configure.ac

@@ -6,6 +6,45 @@ AC_PROG_CXX
 AM_PROG_AR
 LT_INIT
 
+#Enable pkg-config
+AC_ARG_WITH([pkg-config], AS_HELP_STRING([--with-pkg-config], [Use pkg-config to determine configuration of some dependencies]),[use_pkgconfig="yes"],[use_pkgconfig="no"])
+
+#Check if pkg-config is installed
+no_pkgconfig=1
+if test "x$use_pkgconfig" != "xno"; then
+    no_pkgconfig=$(echo $(pkg-config 2>&1) | grep -c "not found")
+    if [[ "${no_pkgconfig}" -eq 0 ]]; then
+	AC_MSG_NOTICE([pkg-config was detected])
+    fi
+fi
+
+#spdlog propagates its compile flags through cmake targets and pkg-config but doesn't for autotools
+#thus if pkg-config is available we try to get the flags there
+if [[ "${no_pkgconfig}" -eq 0 ]]; then
+   SPDLOG_CFLAGS=$(pkg-config --cflags spdlog 2>&1)
+   if [[ $(echo ${SPDLOG_CFLAGS} | grep -c "not found") -eq 1 ]]; then
+       AC_MSG_FAILURE(["Cannot find spdlog configuration with pkg-config"])
+   fi
+   CXXFLAGS+=" ${SPDLOG_CFLAGS} "
+   SPDLOG_LDFLAGS=$(pkg-config --libs spdlog 2>&1)
+   LDFLAGS+=" ${SPDLOG_LDFLAGS} " 
+   AC_MSG_NOTICE([Retrieved configuration for spdlog from pkg-config])
+fi
+
+#on the IC the incorrect build of zmq is being used despite spack. Here we explicitly set the paths using pkg-config
+if [[ "${no_pkgconfig}" -eq 0 ]]; then
+   ZMQ_CFLAGS=$(pkg-config --cflags libzmq 2>&1)
+   if [[ $(echo ${ZMQ_CFLAGS} | grep -c "not found") -eq 1 ]]; then
+       AC_MSG_FAILURE(["Cannot find libzmq configuration with pkg-config"])
+   fi
+   CXXFLAGS+=" ${ZMQ_CFLAGS} "
+   ZMQ_LDFLAGS=$(pkg-config --libs libzmq 2>&1)
+   LDFLAGS+=" ${ZMQ_LDFLAGS} " 
+   AC_MSG_NOTICE([Retrieved configuration for libzmq from pkg-config])
+fi
+
+
+
 # Check if compiling to generate a coverage report using gcov
 # Once built, run the tests in the install/test directory, then from the build directory run
 #(pip3 install gcovr)
@@ -172,7 +211,6 @@ if test "x$with_boost" != "x"; then
 fi
 AC_CHECK_HEADERS([boost/math/distributions/normal.hpp], [],    [AC_MSG_ERROR(Boost library is required)])
 
-
 AC_CONFIG_HEADERS([chimbuko_config.h])
 AC_SUBST([PS_FLAGS])
 

spack/repo/chimbuko/packages/chimbuko-performance-analysis/package.py

@@ -18,7 +18,8 @@ class ChimbukoPerformanceAnalysis(AutotoolsPackage):
 
     variant('perf-metric', default=True, description='Build with performance monitoring')
     variant('mpi', default=True, description='Enable building Chimbuko with MPI. If disabled the user must manually provide the rank index to the OAD.')
-    
+    variant('pkg-config', default=True, description='Enable the configuration script to use pkg-config to aid in the configuration of dependencies')
+
     depends_on('mpi', when="+mpi")
     depends_on('cereal')
     depends_on('adios2')
@@ -32,6 +33,7 @@ class ChimbukoPerformanceAnalysis(AutotoolsPackage):
     depends_on('automake', type='build')
     depends_on('libtool',  type='build')
     depends_on('m4',       type='build')
+    depends_on('pkgconfig', when='+pkg-config', type='build')
 
 
     def setup_build_environment(self, env):
@@ -45,5 +47,8 @@ def configure_args(self):
                args.append('--with-perf-metric')
         if '+mpi' not in self.spec:
                args.append('--disable-mpi')
+        if '+pkg-config' in self.spec:
+               args.append('--with-pkg-config')
+
 
         return args