diff --git a/Homework3/CMakeLists.txt b/Homework3/CMakeLists.txt index a882400..bc6e306 100644 --- a/Homework3/CMakeLists.txt +++ b/Homework3/CMakeLists.txt @@ -1 +1,5 @@ -add_subdirectory(src/) \ No newline at end of file +cmake_minimum_required (VERSION 3.1) +project (Particles) +cmake_policy(VERSION 3.3) + +add_subdirectory(src/) diff --git a/Homework3/src/CMakeLists.txt b/Homework3/src/CMakeLists.txt index 7178b1f..6672c01 100644 --- a/Homework3/src/CMakeLists.txt +++ b/Homework3/src/CMakeLists.txt @@ -1,63 +1,63 @@ cmake_minimum_required (VERSION 3.1) project (Particles) cmake_policy(VERSION 3.3) set(CMAKE_CXX_STANDARD 14) ################################################################ # libpart ################################################################ add_library(part compute_boundary.cc compute_verlet_integration.cc particle.cc planet.cc compute_gravity.cc csv_reader.cc particles_factory_interface.cc planets_factory.cc compute_contact.cc compute_kinetic_energy.cc csv_writer.cc system.cc compute_energy.cc compute_potential_energy.cc ping_pong_ball.cc material_point.cc system_evolution.cc ping_pong_balls_factory.cc compute_interaction.cc compute_temperature.cc material_points_factory.cc ) add_executable(particles main.cc) target_link_libraries(particles part) ################################################################ # Google test ################################################################ -add_subdirectory(googletest) +#add_subdirectory(googletest) -add_executable(test_kepler test_kepler.cc) -add_executable(test_fft test_fft.cc) -target_link_libraries(test_kepler part gtest_main gtest pthread) -target_link_libraries(test_fft part gtest_main gtest ${FFTW_LIBRARIES} pthread) +#add_executable(test_kepler test_kepler.cc) +#add_executable(test_fft test_fft.cc) +#target_link_libraries(test_kepler part gtest_main gtest pthread) +#target_link_libraries(test_fft part gtest_main gtest ${FFTW_LIBRARIES} pthread) ################################################################ # Doxygen ################################################################ find_package(Doxygen) if (DOXYGEN_FOUND) # to set other options, read: https://cmake.org/cmake/help/v3.9/module/FindDoxygen.html doxygen_add_docs( doxygen ${PROJECT_SOURCE_DIR} COMMENT "Generate html pages" ) add_custom_target(doc DEPENDS doxygen) endif(DOXYGEN_FOUND)