From 40fe15ee6190427f3bbc5db4ff640442626cc3bb Mon Sep 17 00:00:00 2001 From: Alexander Schmidt Date: Wed, 20 Jul 2016 22:29:48 +0200 Subject: [PATCH] Changed directory structure --- CMakeLists.txt | 18 +----------------- sea.h => include/sea.h | 0 seafwd.h => include/seafwd.h | 0 seaview.h => include/seaview.h | 0 surfacepoint.h => include/surfacepoint.h | 0 watersurface.h => include/watersurface.h | 0 watersurfacefwd.h => include/watersurfacefwd.h | 0 src/CMakeLists.txt | 18 ++++++++++++++++++ sea.cpp => src/sea.cpp | 0 seamulator.cpp => src/seamulator.cpp | 0 seaview.cpp => src/seaview.cpp | 0 surfacepoint.cpp => src/surfacepoint.cpp | 0 watersurface.cpp => src/watersurface.cpp | 0 13 files changed, 19 insertions(+), 17 deletions(-) rename sea.h => include/sea.h (100%) rename seafwd.h => include/seafwd.h (100%) rename seaview.h => include/seaview.h (100%) rename surfacepoint.h => include/surfacepoint.h (100%) rename watersurface.h => include/watersurface.h (100%) rename watersurfacefwd.h => include/watersurfacefwd.h (100%) create mode 100644 src/CMakeLists.txt rename sea.cpp => src/sea.cpp (100%) rename seamulator.cpp => src/seamulator.cpp (100%) rename seaview.cpp => src/seaview.cpp (100%) rename surfacepoint.cpp => src/surfacepoint.cpp (100%) rename watersurface.cpp => src/watersurface.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6b7e6b..5fff49e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,20 +2,4 @@ cmake_minimum_required(VERSION 2.8) project(seamulator) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}") - -find_package(OpenGL REQUIRED) -find_package(GLUT REQUIRED) -find_package(fftw3 REQUIRED) - -include_directories(${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} - ${FFTW_INCLUDES}) - -add_executable(seamulator seamulator.cpp - sea.cpp watersurface.cpp surfacepoint.cpp - seaview.cpp) - -target_link_libraries(seamulator ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} - ${FFTW_LIBRARIES}) +add_subdirectory(src) diff --git a/sea.h b/include/sea.h similarity index 100% rename from sea.h rename to include/sea.h diff --git a/seafwd.h b/include/seafwd.h similarity index 100% rename from seafwd.h rename to include/seafwd.h diff --git a/seaview.h b/include/seaview.h similarity index 100% rename from seaview.h rename to include/seaview.h diff --git a/surfacepoint.h b/include/surfacepoint.h similarity index 100% rename from surfacepoint.h rename to include/surfacepoint.h diff --git a/watersurface.h b/include/watersurface.h similarity index 100% rename from watersurface.h rename to include/watersurface.h diff --git a/watersurfacefwd.h b/include/watersurfacefwd.h similarity index 100% rename from watersurfacefwd.h rename to include/watersurfacefwd.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..24c9ef6 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,18 @@ +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}") + +find_package(OpenGL REQUIRED) +find_package(GLUT REQUIRED) +find_package(fftw3 REQUIRED) + +include_directories(${seamulator_SOURCE_DIR}/include + ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} + ${FFTW_INCLUDES}) + +add_executable(seamulator seamulator.cpp + sea.cpp watersurface.cpp surfacepoint.cpp + seaview.cpp) + +target_link_libraries(seamulator ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} + ${FFTW_LIBRARIES}) diff --git a/sea.cpp b/src/sea.cpp similarity index 100% rename from sea.cpp rename to src/sea.cpp diff --git a/seamulator.cpp b/src/seamulator.cpp similarity index 100% rename from seamulator.cpp rename to src/seamulator.cpp diff --git a/seaview.cpp b/src/seaview.cpp similarity index 100% rename from seaview.cpp rename to src/seaview.cpp diff --git a/surfacepoint.cpp b/src/surfacepoint.cpp similarity index 100% rename from surfacepoint.cpp rename to src/surfacepoint.cpp diff --git a/watersurface.cpp b/src/watersurface.cpp similarity index 100% rename from watersurface.cpp rename to src/watersurface.cpp -- 2.39.2