Clean up build system

Author: jeanlucf22

CMakeLists.txt

@@ -28,10 +28,9 @@ set(HDF5_USE_STATIC_LIBRARIES ON)
 find_package(HDF5 COMPONENTS CXX HL REQUIRED)
 message(STATUS ${HDF5_VERSION} )
 include_directories(${HDF5_INCLUDE_DIR})
-#set(_hdf5_libs hdf5 hdf5_cpp)
 message(STATUS "hdf5 libraries: ${HDF5_LIBRARIES}")
-set(_hdf5_libs ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES})
-message(STATUS "hdf5 libraries: ${_hdf5_libs}")
+set(PROJECT_LINK_LIBS_HDF5 ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES})
+message(STATUS "hdf5 libraries: ${PROJECT_LINK_LIBS_HDF5}")
 
 find_package(Boost)
 if(Boost_FOUND)

INSTALL

@@ -132,14 +132,15 @@ From the build directory, run a "cmake script". For example on syrah:
 
    ../scripts/peloton_cmake
 
+where the solver dimension is specified (2d or 3d).
 If a script does not exist for the platform-compiler_optimization
 combination you want, you'll have to create your own using one of the
 existing "cmake" scripts as an example.
 Then run:
    make
 
-It will create the main executable build/source/main as well as executable
-unit tests.
+It will create the main executable build/source/ampe2d (or ampe3d) as well
+as executable unit tests.
 
 To run the test suite, run:
    make test

source/CMakeLists.txt

@@ -169,14 +169,15 @@ foreach(file ${M4FILESDIM})
   list(APPEND SOURCES_FORTRAN_DIM ${SOURCE_FORTRAN_DIM_DIR}/${file}.f)
 endforeach()
 
-add_executable(main ${SOURCES} ${SOURCES_FORTRAN} ${SOURCES_FORTRAN_DIM})
+set(MAIN ampe${NDIM}d)
+add_executable(${MAIN} ${SOURCES} ${SOURCES_FORTRAN} ${SOURCES_FORTRAN_DIM})
 
-target_link_libraries(main ${PROJECT_LINK_LIBS_SAMRAI} 
-                           ${PROJECT_LINK_LIBS_HYPRE}
-                           ${PROJECT_LINK_LIBS_CVODE}
-                           ${PROJECT_LINK_LIBS_CPODES}
-                           ${PROJECT_LINK_LIBS_NETCDFCXX}
-                           ${PROJECT_LINK_LIBS_NETCDF}
-                           ${_hdf5_libs}
+target_link_libraries(${MAIN} ${PROJECT_LINK_LIBS_SAMRAI}
+                              ${PROJECT_LINK_LIBS_HYPRE}
+                              ${PROJECT_LINK_LIBS_CVODE}
+                              ${PROJECT_LINK_LIBS_CPODES}
+                              ${PROJECT_LINK_LIBS_NETCDFCXX}
+                              ${PROJECT_LINK_LIBS_NETCDF}
+                              ${PROJECT_LINK_LIBS_HDF5}
                       )
 

tests/CMakeLists.txt

@@ -126,24 +126,24 @@ add_test(NAME testCALPHADternaryKKS
 
 target_link_libraries(testNetCDF ${PROJECT_LINK_LIBS_NETCDFCXX}
                                  ${PROJECT_LINK_LIBS_NETCDF}
-                                 ${_hdf5_libs})
+                                 ${PROJECT_LINK_LIBS_HDF5})
 target_link_libraries(testMPI ${PROJECT_LINK_LIBS1})
 target_link_libraries(testHyprePoisson ${PROJECT_LINK_LIBS_SAMRAI}
                                      ${PROJECT_LINK_LIBS_HYPRE}
-                                     ${_hdf5_libs}
+                                     ${PROJECT_LINK_LIBS_HDF5}
                                      )
 target_link_libraries(testPhaseHypre ${PROJECT_LINK_LIBS_SAMRAI}
                                      ${PROJECT_LINK_LIBS_HYPRE}
-                                     ${_hdf5_libs}
+                                     ${PROJECT_LINK_LIBS_HDF5}
                                      )
 target_link_libraries(testFACPoisson ${PROJECT_LINK_LIBS_SAMRAI}
                                      ${PROJECT_LINK_LIBS_HYPRE}
-                                     ${_hdf5_libs}
+                                     ${PROJECT_LINK_LIBS_HDF5}
                                      )
 target_link_libraries(testCALPHADbinaryKKS ${PROJECT_LINK_LIBS_SAMRAI}
-                                     ${_hdf5_libs}
+                                     ${PROJECT_LINK_LIBS_HDF5}
                                      )
 target_link_libraries(testCALPHADternaryKKS ${PROJECT_LINK_LIBS_SAMRAI}
-                                     ${_hdf5_libs}
+                                     ${PROJECT_LINK_LIBS_HDF5}
                                      )