[MOAB-dev] r5944 - in MOAB/trunk: . src/moab
tautges at mcs.anl.gov
tautges at mcs.anl.gov
Fri Jan 18 19:25:05 CST 2013
Author: tautges
Date: 2013-01-18 19:25:05 -0600 (Fri, 18 Jan 2013)
New Revision: 5944
Added:
MOAB/trunk/MOABConfig.cmake.in
Modified:
MOAB/trunk/Makefile.am
MOAB/trunk/configure.ac
MOAB/trunk/src/moab/ScdInterface.hpp
Log:
Adding the ability for MOAB to write a MOABConfig.cmake file, which gets
installed into the lib directory. This isn't quite sorted out yet, but
it's getting there.
Also add a comment to ScdInterface.hpp on meaning of various partitioning methods.
Added: MOAB/trunk/MOABConfig.cmake.in
===================================================================
--- MOAB/trunk/MOABConfig.cmake.in (rev 0)
+++ MOAB/trunk/MOABConfig.cmake.in 2013-01-19 01:25:05 UTC (rev 5944)
@@ -0,0 +1,25 @@
+# Config file for MOAB
+# This file defines the following variables:
+# MOAB_FOUND - boolean indicating that MOAB is found
+# MOAB_INCLUDE_DIRS - include directories from which to pick up MOAB includes
+# MOAB_LIBRARIES - libraries need to link to MOAB; use this in target_link_libraries for MOAB-dependent targets
+# MOAB_CXX, MOAB_CC, MOAB_F77, MOAB_FC - compilers used to compile MOAB
+# MOAB_CXXFLAGS, MOAB_CCFLAGS, MOAB_FFLAGS, MOAB_FCFLAGS - compiler flags used to compile MOAB; possibly need to use these in add_definitions or CMAKE_<LANG>_FLAGS_<MODE>
+
+SET(MOAB_FOUND 1)
+
+# Compilers used by MOAB
+
+SET(MOAB_CXX "@CXX@")
+SET(MOAB_CC "@CC@")
+SET(MOAB_F77 "@F77@")
+SET(MOAB_FC "@FC@")
+
+
+# Compiler flags used by MOAB
+
+SET(MOAB_CXXFLAGS "@CXXFLAGS@ @AM_CXXFLAGS@")
+SET(MOAB_CFLAGS "@CFLAGS@ @AM_CFLAGS@")
+SET(MOAB_FORTRAN_FLAGS "@MOAB_FFLAGS@ @AM_FFLAGS@")
+
+# Library and include defs
Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am 2013-01-18 19:25:52 UTC (rev 5943)
+++ MOAB/trunk/Makefile.am 2013-01-19 01:25:05 UTC (rev 5944)
@@ -34,7 +34,7 @@
# in $(libdir). Define a $(cfgdir) to get around automake's
# check that only libraries are going in $(libdir)
cfgdir = $(libdir)
-cfg_DATA = moab.make moab.config
+cfg_DATA = moab.make moab.config MOABConfig.cmake
# By default, moab.make will define these to $(srcdir). We
# want to override that during the INSTALL of the file so
@@ -44,8 +44,13 @@
install-data-hook:
$(AM_V_at)echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/moab.make
$(AM_V_at)echo "MOAB_INCLUDES=-I${includedir}" >> $(DESTDIR)$(cfgdir)/moab.make
+ $(AM_V_at)echo "SET(MOAB_INCLUDE_DIRS \"${includedir}\")" >> $(DESTDIR)$(cfgdir)/MOABConfig.cmake
+ echo -n "SET(MOAB_LIBRARIES \"" >> $(DESTDIR)$(cfgdir)/MOABConfig.cmake
+# next line: get the post-substitution set of link commands, then filter out leading
More information about the moab-dev
mailing list