From: Alexander Schmidt Date: Wed, 20 Jul 2016 20:37:28 +0000 (+0200) Subject: Moved cmake module X-Git-Url: http://git.treefish.org/~alex/seamulator.git/commitdiff_plain/894b5a0d84e5e22e89c4189c5427c6493d95a8c2 Moved cmake module --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fff49e..64f8a81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,4 +2,6 @@ cmake_minimum_required(VERSION 2.8) project(seamulator) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") + add_subdirectory(src) diff --git a/Findfftw3.cmake b/Findfftw3.cmake deleted file mode 100644 index 00c3401..0000000 --- a/Findfftw3.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# - Find FFTW -# Find the native FFTW includes and library -# -# FFTW_INCLUDES - where to find fftw3.h -# FFTW_LIBRARIES - List of libraries when using FFTW. -# FFTW_FOUND - True if FFTW found. - -if (FFTW_INCLUDES) - # Already in cache, be silent - set (FFTW_FIND_QUIETLY TRUE) -endif (FFTW_INCLUDES) - -find_path (FFTW_INCLUDES fftw3.h) - -find_library (FFTW_LIBRARIES NAMES fftw3) - -# handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if -# all listed variables are TRUE -include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (FFTW DEFAULT_MSG FFTW_LIBRARIES FFTW_INCLUDES) - -mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDES) diff --git a/cmake_modules/Findfftw3.cmake b/cmake_modules/Findfftw3.cmake new file mode 100644 index 0000000..00c3401 --- /dev/null +++ b/cmake_modules/Findfftw3.cmake @@ -0,0 +1,22 @@ +# - Find FFTW +# Find the native FFTW includes and library +# +# FFTW_INCLUDES - where to find fftw3.h +# FFTW_LIBRARIES - List of libraries when using FFTW. +# FFTW_FOUND - True if FFTW found. + +if (FFTW_INCLUDES) + # Already in cache, be silent + set (FFTW_FIND_QUIETLY TRUE) +endif (FFTW_INCLUDES) + +find_path (FFTW_INCLUDES fftw3.h) + +find_library (FFTW_LIBRARIES NAMES fftw3) + +# handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if +# all listed variables are TRUE +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (FFTW DEFAULT_MSG FFTW_LIBRARIES FFTW_INCLUDES) + +mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 24c9ef6..75b9bcb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,5 @@ 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)