From 98f9e362919bb3c4b72a7ecd367418f3fa57bea0 Mon Sep 17 00:00:00 2001 From: Jared Szechy Date: Sun, 1 Jul 2018 09:51:03 -0400 Subject: [PATCH] Cleanup cmake find modules --- CMakeLists.txt | 28 ++++++++++++---------------- cmake/FindITPP.cmake | 29 ++++++++++++----------------- cmake/FindLibMbe.cmake | 20 -------------------- cmake/FindLibSndFile.cmake | 28 ++++++++++++---------------- cmake/FindMBE.cmake | 15 +++++++++++++++ 5 files changed, 51 insertions(+), 69 deletions(-) delete mode 100644 cmake/FindLibMbe.cmake create mode 100644 cmake/FindMBE.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 1486a87..4c1663c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(dsd) -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.11) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") @@ -7,30 +7,26 @@ include(git_revision) git_describe(GIT_TAG) find_package(LibSndFile REQUIRED) -find_package(LibMbe REQUIRED) +find_package(MBE REQUIRED) find_package(ITPP REQUIRED) find_package(LibPortAudio) +include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR}) +set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY}) + +if(PORTAUDIO_FOUND) + include_directories(SYSTEM ${PORTAUDIO_INCLUDE_DIRS}) + list(APPEND LIBS ${PORTAUDIO_LIBRARIES}) + add_definitions(-DUSE_PORTAUDIO) +endif(PORTAUDIO_FOUND) + FILE(GLOB SRCS src/*.c src/*.cpp) FILE(GLOB HEADERS include/*.h include/*.hpp) configure_file("src/git_ver.c.in" "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c" @ONLY) list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c") -INCLUDE_DIRECTORIES( - "${PROJECT_SOURCE_DIR}/include" - "${LIBSNDFILE_INCLUDE_DIR}" - "${LIBMBE_INCLUDE_DIR}" - "${ITPP_INCLUDE_DIR}" -) - -SET(LIBS ${LIBS} ${LIBMBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY}) - -if(PORTAUDIO_FOUND) -SET(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} "${PORTAUDIO_INCLUDE_DIRS}") -SET(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES}) -add_definitions(-DUSE_PORTAUDIO) -endif(PORTAUDIO_FOUND) +include_directories("${PROJECT_SOURCE_DIR}/include") ADD_EXECUTABLE(dsd ${SRCS} ${HEADERS}) TARGET_LINK_LIBRARIES(dsd ${LIBS}) diff --git a/cmake/FindITPP.cmake b/cmake/FindITPP.cmake index e252911..d464252 100644 --- a/cmake/FindITPP.cmake +++ b/cmake/FindITPP.cmake @@ -1,20 +1,15 @@ -# Find ITPP +# - Try to find ITPP +# Once done this will define +# +# ITPP_FOUND - System has ITPP +# ITPP_INCLUDE_DIR - The ITPP include directory +# ITPP_LIBRARY - The library needed to use ITPP +# -FIND_PATH(ITPP_INCLUDE_DIR itpp/itcomm.h) +find_path(ITPP_INCLUDE_DIR itpp/itcomm.h) -SET(ITPP_NAMES ${ITPP_NAMES} itpp libitpp libitpp.dll) -FIND_LIBRARY(ITPP_LIBRARY NAMES ${ITPP_NAMES} PATH) +set(ITPP_NAMES ${ITPP_NAMES} itpp libitpp libitpp.dll) +FIND_LIBRARY(ITPP_LIBRARY NAMES ${ITPP_NAMES}) -IF (ITPP_INCLUDE_DIR AND ITPP_LIBRARY) - SET(ITPP_FOUND TRUE) -ENDIF (ITPP_INCLUDE_DIR AND ITPP_LIBRARY) - -IF (ITPP_FOUND) - IF (NOT ITPP_FIND_QUIETLY) - MESSAGE (STATUS "Found ITPP: ${ITPP_LIBRARY}") - ENDIF (NOT ITPP_FIND_QUIETLY) -ELSE (ITPP_FOUND_FOUND) - IF (ITPP_FIND_REQUIRED) - MESSAGE (FATAL_ERROR "Could not find ITPP") - ENDIF (ITPP_FIND_REQUIRED) -ENDIF (ITPP_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(ITPP DEFAULT_MSG ITPP_LIBRARY ITPP_INCLUDE_DIR) \ No newline at end of file diff --git a/cmake/FindLibMbe.cmake b/cmake/FindLibMbe.cmake deleted file mode 100644 index cfcbbde..0000000 --- a/cmake/FindLibMbe.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# Find libmbe - -FIND_PATH(LIBMBE_INCLUDE_DIR mbelib.h) - -SET(LIBMBE_NAMES ${LIBMBE_NAMES} mbe libmbe) -FIND_LIBRARY(LIBMBE_LIBRARY NAMES ${LIBMBE_NAMES} PATH) - -IF (LIBMBE_INCLUDE_DIR AND LIBMBE_LIBRARY) - SET(LIBMBE_FOUND TRUE) -ENDIF (LIBMBE_INCLUDE_DIR AND LIBMBE_LIBRARY) - -IF (LIBMBE_FOUND) - IF (NOT LibMbe_FIND_QUIETLY) - MESSAGE (STATUS "Found LibMbe: ${LIBMBE_LIBRARY}") - ENDIF (NOT LibMbe_FIND_QUIETLY) -ELSE (LIBMBE_FOUND) - IF (LibMbe_FIND_REQUIRED) - MESSAGE (FATAL_ERROR "Could not find mbe") - ENDIF (LibMbe_FIND_REQUIRED) -ENDIF (LIBMBE_FOUND) diff --git a/cmake/FindLibSndFile.cmake b/cmake/FindLibSndFile.cmake index cd28788..b12b358 100644 --- a/cmake/FindLibSndFile.cmake +++ b/cmake/FindLibSndFile.cmake @@ -1,20 +1,16 @@ -# Find libsndfile +# - Try to find Libsndfile +# Once done this will define +# +# LIBSNDFILE_FOUND - System has LIBSNDFILE +# LIBSNDFILE_INCLUDE_DIR - The SNDFILE include directory +# LIBSNDFILE_LIBRARY - The library needed to use SNDFILE +# -FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h) +find_path(LIBSNDFILE_INCLUDE_DIR sndfile.h) SET(LIBSNDFILE_NAMES ${LIBSNDFILE_NAMES} sndfile libsndfile) -FIND_LIBRARY(LIBSNDFILE_LIBRARY NAMES ${LIBSNDFILE_NAMES} PATH) +FIND_LIBRARY(LIBSNDFILE_LIBRARY NAMES ${LIBSNDFILE_NAMES}) -IF (LIBSNDFILE_INCLUDE_DIR AND LIBSNDFILE_LIBRARY) - SET(LIBSNDFILE_FOUND TRUE) -ENDIF (LIBSNDFILE_INCLUDE_DIR AND LIBSNDFILE_LIBRARY) - -IF (LIBSNDFILE_FOUND) - IF (NOT LibSndFile_FIND_QUIETLY) - MESSAGE (STATUS "Found LibSndFile: ${LIBSNDFILE_LIBRARY}") - ENDIF (NOT LibSndFile_FIND_QUIETLY) -ELSE (LIBSNDFILE_FOUND) - IF (LibSndFile_FIND_REQUIRED) - MESSAGE (FATAL_ERROR "Could not find sndfile") - ENDIF (LibSndFile_FIND_REQUIRED) -ENDIF (LIBSNDFILE_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LIBSNDFILE DEFAULT_MSG LIBSNDFILE_LIBRARY + LIBSNDFILE_INCLUDE_DIR) \ No newline at end of file diff --git a/cmake/FindMBE.cmake b/cmake/FindMBE.cmake new file mode 100644 index 0000000..56ae101 --- /dev/null +++ b/cmake/FindMBE.cmake @@ -0,0 +1,15 @@ +# - Try to find MBE +# Once done this will define +# +# MBE_FOUND - System has MBE +# MBE_INCLUDE_DIR - The MBE include directory +# MBE_LIBRARY - The library needed to use MBE +# + +find_path(MBE_INCLUDE_DIR mbelib.h) + +set(MBE_NAMES ${MBE_NAMES} mbe libmbe) +find_library(MBE_LIBRARY NAMES ${MBE_NAMES}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(MBE DEFAULT_MSG MBE_LIBRARY MBE_INCLUDE_DIR)