diff --git a/CMakeLists.txt b/CMakeLists.txt index f5f1d4690..4b9d14944 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,9 +45,6 @@ ENDIF(FCNAME STREQUAL "pgf90") # Define the executable name SET(FOOEXE swiftest_driver) -# Define the library name -SET(BARLIB libswiftest) - # Define some directories SET(SRC ${CMAKE_SOURCE_DIR}/src) SET(LIB ${CMAKE_SOURCE_DIR}/lib) @@ -79,8 +76,8 @@ SET(WHM ${SRC}/whm) # Have the .mod files placed in the lib folder SET(CMAKE_Fortran_MODULE_DIRECTORY ${LIB}) -# The source for the Swiftest library and have it placed in the lib folder -ADD_SUBDIRECTORY(${BARLIB} ${LIB}) +# The source for the FOO binary and have it placed in the bin folder +ADD_SUBDIRECTORY(${EXE} ${BIN}) # The source for the EXE binary and have it placed in the bin folder ADD_SUBDIRECTORY(${FOOEXE} ${BIN}) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt deleted file mode 100644 index b621d3204..000000000 --- a/lib/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -# bar library -SET(BAR_src ${SRCBAR}/libswiftest.a) -ADD_LIBRARY(${BARLIB} STATIC ${BAR_src}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 021eb0e89..494571aac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -97,31 +97,6 @@ SET(FOO_src ${DISCARD}/discard.f90 # Define the executable in terms of the source files ADD_EXECUTABLE(${FOOEXE} ${FOO_src}) -##################################################### -# Add the needed libraries and special compiler flags -##################################################### - -# This links foo to the bar library -TARGET_LINK_LIBRARIES(${FOOEXE} ${BARLIB}) - -# Uncomment if you need to link to BLAS and LAPACK -#TARGET_LINK_LIBRARIES(${FOOEXE} ${BLAS_LIBRARIES} -# ${LAPACK_LIBRARIES} -# ${CMAKE_THREAD_LIBS_INIT}) - -# Uncomment if you have parallization -IF(USE_OPENMP) - SET_TARGET_PROPERTIES(${FOOEXE} PROPERTIES - COMPILE_FLAGS "${OpenMP_Fortran_FLAGS}" - LINK_FLAGS "${OpenMP_Fortran_FLAGS}") -ELSEIF(USE_MPI) - SET_TARGET_PROPERTIES(${FOOEXE} PROPERTIES - COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS}" - LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}") - INCLUDE_DIRECTORIES(${MPI_Fortran_INCLUDE_PATH}) - TARGET_LINK_LIBRARIES(${FOOEXE} ${MPI_Fortran_LIBRARIES}) -ENDIF(USE_OPENMP) - ##################################### # Tell how to install this executable #####################################