Merge pull request #65 from laristra/reorg

Support a modular approach to cinch
laristra · May 8, 2017 · 75f173b · 75f173b
2 parents a457085 + 816f7e6
commit 75f173b
Show file tree

Hide file tree

Showing 7 changed files with 722 additions and 340 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,6 @@ addons:
       - cmake
       - cmake-data
       - libopenmpi-dev
-#      - libcereal-dev
       - openmpi-bin
       - gcc-4.9
       - g++-4.9
@@ -35,8 +34,8 @@ env: #maybe add mpich later
     - MPI=OFF TEST=laristra/cinch-nested-example
     - MPI=ON  TEST=losalamos/vpic
     - MPI=OFF TEST=losalamos/vpic
-#    - MPI=ON  TEST=laristra/flecsi GVER=5
-#    - MPI=OFF TEST=laristra/flecsi GVER=5
+    - MPI=ON  TEST=laristra/flecsi GVER=5
+    - MPI=OFF TEST=laristra/flecsi GVER=5
 
 script:
   - git checkout -b cinch_current_commit

diff --git a/cmake/PFUnitLists.txt b/cmake/PFUnitLists.txt
@@ -86,11 +86,7 @@ set_target_properties(pfunit
 set_target_properties(pfunit
     PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pfunit/generated)
 
-if(BUILD_SHARED_LIBS)
-    set(PFUNIT_LIBRARY ${CMAKE_BINARY_DIR}/pfunit/lib/libpfunit.so)
-else()
-    set(PFUNIT_LIBRARY ${CMAKE_BINARY_DIR}/pfunit/lib/libpfunit.a)
-endif(BUILD_SHARED_LIBS)
+set(PFUNIT_LIBRARY pfunit)
 
 set(PFUNIT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pfunit/include)
 set(PFUNIT_DRIVER ${CMAKE_SOURCE_DIR}/cinch/pfunit/include/driver.F90)