From 241c1703459642f5d7d28cf6d32ff1c24fa6da43 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 14 May 2013 11:46:19 -0700 Subject: [PATCH] refactor find modules so they complain when things are missing --- cmake/modules/FindLibOVR.cmake | 24 ++++++++++++------------ cmake/modules/FindLodePNG.cmake | 30 +++++++++++------------------- cmake/modules/FindPortAudio.cmake | 28 ++++++++++++++-------------- interface/CMakeLists.txt | 4 ++-- 4 files changed, 39 insertions(+), 47 deletions(-) diff --git a/cmake/modules/FindLibOVR.cmake b/cmake/modules/FindLibOVR.cmake index cad962732c..4b4d35bb55 100644 --- a/cmake/modules/FindLibOVR.cmake +++ b/cmake/modules/FindLibOVR.cmake @@ -6,31 +6,31 @@ # # LIBOVR_FOUND - system found LibOVR # LIBOVR_INCLUDE_DIRS - the LibOVR include directory -# LIBOVR_LIBRARY - Link this to use LibOVR +# LIBOVR_LIBRARIES - Link this to use LibOVR # # Created on 5/9/2013 by Stephen Birarda # Copyright (c) 2013 High Fidelity # -if (LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIRS) +if (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS) # in cache already set(LIBOVR_FOUND TRUE) -else (LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIRS) - set(LIBOVR_INCLUDE_DIRS ${LIBOVR_ROOT_DIR}/Include) +else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS) + find_path(LIBOVR_INCLUDE_DIRS OVR.h ${LIBOVR_ROOT_DIR}/Include) if (APPLE) - set(LIBOVR_LIBRARY ${LIBOVR_ROOT_DIR}/Lib/MacOS/libovr.a) + find_library(LIBOVR_LIBRARIES libovr.a ${LIBOVR_ROOT_DIR}/Lib/MacOS/) else (WIN32) - set(LIBOVR_LIBRARY ${LIBOVR_ROOT_DIR}/Lib/Win32/libovr.lib) + find_library(LIBOVR_LIBRARIES libovr.lib ${LIBOVR_ROOT_DIR}/Lib/Win32/) endif () - if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARY) + if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES) set(LIBOVR_FOUND TRUE) - endif (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARY) + endif (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES) if (LIBOVR_FOUND) if (NOT LibOVR_FIND_QUIETLY) - message(STATUS "Found LibOVR: ${LIBOVR_LIBRARY}") + message(STATUS "Found LibOVR: ${LIBOVR_LIBRARIES}") endif (NOT LibOVR_FIND_QUIETLY) else (LIBOVR_FOUND) if (LibOVR_FIND_REQUIRED) @@ -38,7 +38,7 @@ else (LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIRS) endif (LibOVR_FIND_REQUIRED) endif (LIBOVR_FOUND) - # show the LIBOVR_INCLUDE_DIRS and LIBOVR_LIBRARY variables only in the advanced view - mark_as_advanced(LIBOVR_INCLUDE_DIRS LIBOVR_LIBRARY) + # show the LIBOVR_INCLUDE_DIRS and LIBOVR_LIBRARIES variables only in the advanced view + mark_as_advanced(LIBOVR_INCLUDE_DIRS LIBOVR_LIBRARIES) -endif (LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIRS) \ No newline at end of file +endif (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS) \ No newline at end of file diff --git a/cmake/modules/FindLodePNG.cmake b/cmake/modules/FindLodePNG.cmake index 4568d59765..c36e238029 100644 --- a/cmake/modules/FindLodePNG.cmake +++ b/cmake/modules/FindLodePNG.cmake @@ -6,34 +6,26 @@ # # LODEPNG_FOUND - system has LODEPNG_FOUND # LODEPNG_INCLUDE_DIRS - the LodePNG include directory -# LODEPNG_LIBRARY - Link these to use LodePNG +# LODEPNG_LIBRARIES- Link these to use LodePNG # # Copyright (c) 2013 Stephen Birarda # -if (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS) +if (LODEPNG_LIBRARIES AND LODEPNG_INCLUDE_DIRS) # in cache already set(LODEPNG_FOUND TRUE) -else (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS) +else (LODEPNG_LIBRARIES AND LODEPNG_INCLUDE_DIRS) - FIND_PATH(LODEPNG_INCLUDE_DIR "lodepng.h" - PATHS ${LODEPNG_ROOT_DIR}) + find_path(LODEPNG_INCLUDE_DIRS lodepng.h ${LODEPNG_ROOT_DIR}) + find_file(LODEPNG_LIBRARIES lodepng.cpp ${LODEPNG_ROOT_DIR}) - set(LODEPNG_INCLUDE_DIRS - ${LODEPNG_INCLUDE_DIR} - ) - - set(LODEPNG_LIBRARY - ${LODEPNG_ROOT_DIR}/lodepng.cpp - ) - - if (LODEPNG_INCLUDE_DIRS AND LODEPNG_LIBRARY) + if (LODEPNG_INCLUDE_DIRS AND LODEPNG_LIBRARIES) set(LODEPNG_FOUND TRUE) - endif (LODEPNG_INCLUDE_DIRS AND LODEPNG_LIBRARY) + endif (LODEPNG_INCLUDE_DIRS AND LODEPNG_LIBRARIES) if (LODEPNG_FOUND) if (NOT LodePNG_FIND_QUIETLY) - message(STATUS "Found LodePNG: ${LODEPNG_LIBRARY}") + message(STATUS "Found LodePNG: ${LODEPNG_LIBRARIES}") endif (NOT LodePNG_FIND_QUIETLY) else (LODEPNG_FOUND) if (LodePNG_FIND_REQUIRED) @@ -41,7 +33,7 @@ else (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS) endif (LodePNG_FIND_REQUIRED) endif (LODEPNG_FOUND) - # show the LODEPNG_INCLUDE_DIRS and LODEPNG_LIBRARY variables only in the advanced view - mark_as_advanced(LODEPNG_INCLUDE_DIRS LODEPNG_LIBRARY) + # show the LODEPNG_INCLUDE_DIRS and LODEPNG_LIBRARIES variables only in the advanced view + mark_as_advanced(LODEPNG_INCLUDE_DIRS LODEPNG_LIBRARIES) -endif (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS) \ No newline at end of file +endif (LODEPNG_LIBRARIES AND LODEPNG_INCLUDE_DIRS) \ No newline at end of file diff --git a/cmake/modules/FindPortAudio.cmake b/cmake/modules/FindPortAudio.cmake index e2a1d795d9..9b6ac884b6 100644 --- a/cmake/modules/FindPortAudio.cmake +++ b/cmake/modules/FindPortAudio.cmake @@ -6,31 +6,31 @@ # # PORTAUDIO_FOUND - system found PortAudio # PORTAUDIO_INCLUDE_DIRS - the PortAudio include directory -# PORTAUDIO_LIBRARY - Link this to use PortAudio +# PORTAUDIO_LIBRARIES - Link this to use PortAudio # # Created on 5/14/2013 by Stephen Birarda # Copyright (c) 2013 High Fidelity # -if (PORTAUDIO_LIBRARY AND PORTAUDIO_INCLUDE_DIRS) +if (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS) # in cache already set(PORTAUDIO_FOUND TRUE) -else (PORTAUDIO_LIBRARY AND PORTAUDIO_INCLUDE_DIRS) - set(PORTAUDIO_INCLUDE_DIRS ${PORTAUDIO_ROOT_DIR}/include) +else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS) + find_path(PORTAUDIO_INCLUDE_DIRS portaudio.h ${PORTAUDIO_ROOT_DIR}/include) if (APPLE) - set(PORTAUDIO_LIBRARY ${PORTAUDIO_ROOT_DIR}/lib/MacOS/libportaudio.a) - else (WIN32) - set(PORTAUDIO_LIBRARY ${PORTAUDIO_ROOT_DIR}/lib/UNIX/libportaudio.a) + find_library(PORTAUDIO_LIBRARIES libportaudio.a ${PORTAUDIO_ROOT_DIR}/lib/MacOS/) + else (UNIX) + find_library(PORTAUDIO_LIBRARIES libportaudio.a ${PORTAUDIO_ROOT_DIR}/lib/UNIX/) endif () - if (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARY) - set(PORTAUDIO_FOUND TRUE) - endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARY) + if (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES) + set(PORTAUDIO_FOUND TRUE) + endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES) if (PORTAUDIO_FOUND) if (NOT PortAudio_FIND_QUIETLY) - message(STATUS "Found PortAudio: ${PORTAUDIO_LIBRARY}") + message(STATUS "Found PortAudio: ${PORTAUDIO_LIBRARIES}") endif (NOT PortAudio_FIND_QUIETLY) else (PORTAUDIO_FOUND) if (PortAudio_FIND_REQUIRED) @@ -38,7 +38,7 @@ else (PORTAUDIO_LIBRARY AND PORTAUDIO_INCLUDE_DIRS) endif (PortAudio_FIND_REQUIRED) endif (PORTAUDIO_FOUND) - # show the PORTAUDIO_INCLUDE_DIRS and PORTAUDIO_LIBRARY variables only in the advanced view - mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARY) + # show the PORTAUDIO_INCLUDE_DIRS and PORTAUDIO_LIBRARIES variables only in the advanced view + mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES) -endif (PORTAUDIO_LIBRARY AND PORTAUDIO_INCLUDE_DIRS) \ No newline at end of file +endif (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS) \ No newline at end of file diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 78f736b343..7a8fc599e4 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -109,7 +109,7 @@ if (APPLE) ${GLUT} ${OpenGL} ${IOKit} - ${LIBOVR_LIBRARY} + ${LIBOVR_LIBRARIES} ) else (APPLE) find_package(OpenGL REQUIRED) @@ -134,7 +134,7 @@ else (WIN32) # link the PortAudio library find_package(PortAudio REQUIRED) include_directories(${PORTAUDIO_INCLUDE_DIRS}) - target_link_libraries(${TARGET_NAME} ${PORTAUDIO_LIBRARY}) + target_link_libraries(${TARGET_NAME} ${PORTAUDIO_LIBRARIES}) # link required libraries on UNIX if (UNIX AND NOT APPLE)