From 9e83040fb4ce1ff34858c40cb29b86a5d8e72371 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 18 Jul 2014 10:20:12 -0700 Subject: [PATCH] more find module standardization and cleanup --- cmake/modules/FindLibOVR.cmake | 15 ++++++++------- cmake/modules/FindQxmpp.cmake | 10 +++++++--- cmake/modules/FindRtMidi.cmake | 10 ++++++---- cmake/modules/FindSixense.cmake | 4 ++++ interface/CMakeLists.txt | 8 ++++---- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/cmake/modules/FindLibOVR.cmake b/cmake/modules/FindLibOVR.cmake index 06cee5e87e..73c69adbcb 100644 --- a/cmake/modules/FindLibOVR.cmake +++ b/cmake/modules/FindLibOVR.cmake @@ -26,6 +26,8 @@ find_path(LIBOVR_UTIL_INCLUDE_DIR Util_Render_Stereo.h PATH_SUFFIXES Src/Util HI # add the util include dir to the general include dirs set(LIBOVR_INCLUDE_DIRS "${LIBOVR_INCLUDE_DIRS}" "${LIBOVR_UTIL_INCLUDE_DIR}") +include(SelectLibraryConfigurations) + if (APPLE) find_library(LIBOVR_LIBRARY_DEBUG "Lib/MacOS/Debug/libovr.a" HINTS ${LIBOVR_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_RELEASE "Lib/MacOS/Release/libovr.a" HINTS ${LIBOVR_SEARCH_DIRS}) @@ -42,20 +44,17 @@ elseif (UNIX) find_library(LIBOVR_LIBRARY_DEBUG "Lib/Linux/Debug/${LINUX_ARCH_DIR}/libovr.a" HINTS ${LIBOVR_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_RELEASE "Lib/Linux/Release/${LINUX_ARCH_DIR}/libovr.a" HINTS ${LIBOVR_SEARCH_DIRS}) + select_library_configurations(UDEV) + select_library_configurations(XINERAMA) + elseif (WIN32) find_library(LIBOVR_LIBRARY_DEBUG "Lib/Win32/libovrd.lib" HINTS ${LIBOVR_SEARCH_DIRS}) find_library(LIBOVR_LIBRARY_RELEASE "Lib/Win32/libovr.lib" HINTS ${LIBOVR_SEARCH_DIRS}) endif () -include(SelectLibraryConfigurations) select_library_configurations(LIBOVR) -if (UNIX) - select_library_configurations(UDEV) - select_library_configurations(XINERAMA) - - set(LIBOVR_LIBRARIES ${LIBOVR_LIBRARIES} ${UDEV_LIBRARY} ${XINERAMA_LIBRARY}) -endif () +set(LIBOVR_LIBRARIES "${LIBOVR_LIBRARIES}" "${UDEV_LIBRARY}" "${XINERAMA_LIBRARY}") include(FindPackageHandleStandardArgs) if (UNIX) @@ -63,3 +62,5 @@ if (UNIX) elseif () find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_UTIL_INCLUDE_DIR LIBOVR_LIBRARIES UDEV_LIBRARY XINERAMA_LIBRARY) endif () + +mark_as_advanced(LIBOVR_INCLUDE_DIRS LIBOVR_LIBRARIES) diff --git a/cmake/modules/FindQxmpp.cmake b/cmake/modules/FindQxmpp.cmake index ac10982d61..71c99369aa 100644 --- a/cmake/modules/FindQxmpp.cmake +++ b/cmake/modules/FindQxmpp.cmake @@ -9,7 +9,7 @@ # # QXMPP_FOUND - system found qxmpp # QXMPP_INCLUDE_DIRS - the qxmpp include directory -# QXMPP_LIBRARY - Link this to use qxmpp +# QXMPP_LIBRARIES - Link this to use qxmpp # # Created on 3/10/2014 by Stephen Birarda # Copyright 2014 High Fidelity, Inc. @@ -20,7 +20,7 @@ set(QXMPP_SEARCH_DIRS "${QXMPP_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/qxmpp") -find_path(QXMPP_INCLUDE_DIR QXmppClient.h PATH_SUFFIXES include/qxmpp HINTS ${QXMPP_SEARCH_DIRS}) +find_path(QXMPP_INCLUDE_DIRS QXmppClient.h PATH_SUFFIXES include/qxmpp HINTS ${QXMPP_SEARCH_DIRS}) find_library(QXMPP_LIBRARY_RELEASE NAMES qxmpp PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS}) find_library(QXMPP_LIBRARY_DEBUG NAMES qxmpp_d PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS}) @@ -28,5 +28,9 @@ find_library(QXMPP_LIBRARY_DEBUG NAMES qxmpp_d PATH_SUFFIXES lib HINTS ${QXMPP_S include(SelectLibraryConfigurations) select_library_configurations(QXMPP) +set(QXMPP_LIBRARIES "${QXMPP_LIBRARY}") + include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(QXMPP DEFAULT_MSG QXMPP_INCLUDE_DIR QXMPP_LIBRARY) \ No newline at end of file +find_package_handle_standard_args(QXMPP DEFAULT_MSG QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES) + +mark_as_advanced(QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES) \ No newline at end of file diff --git a/cmake/modules/FindRtMidi.cmake b/cmake/modules/FindRtMidi.cmake index 0b3084b7fb..d03477710c 100644 --- a/cmake/modules/FindRtMidi.cmake +++ b/cmake/modules/FindRtMidi.cmake @@ -9,7 +9,7 @@ # # RTMIDI_FOUND - system found RtMidi # RTMIDI_INCLUDE_DIRS - the RtMidi include directory -# RTMIDI_CPP - Include this with src to use RtMidi +# RTMIDI_LIBRARIES - link to this to use RtMidi # # Created on 6/30/2014 by Stephen Birarda # Copyright 2014 High Fidelity, Inc. @@ -20,8 +20,10 @@ set(RTMIDI_SEARCH_DIRS "${RTMIDI_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/rtmidi") -find_path(RTMIDI_INCLUDE_DIR RtMidi.h PATH_SUFFIXES include HINTS ${RTMIDI_SEARCH_DIRS}) -find_library(RTMIDI_LIBRARY NAMES rtmidi PATH_SUFFIXES lib HINTS ${RTMIDI_SEARCH_DIRS}) +find_path(RTMIDI_INCLUDE_DIRS RtMidi.h PATH_SUFFIXES include HINTS ${RTMIDI_SEARCH_DIRS}) +find_library(RTMIDI_LIBRARIES NAMES rtmidi PATH_SUFFIXES lib HINTS ${RTMIDI_SEARCH_DIRS}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(RTMIDI DEFAULT_MSG RTMIDI_INCLUDE_DIR RTMIDI_LIBRARY) \ No newline at end of file +find_package_handle_standard_args(RTMIDI DEFAULT_MSG RTMIDI_INCLUDE_DIRS RTMIDI_LIBRARIES) + +mark_as_advanced(RTMIDI_INCLUDE_DIRS RTMIDI_LIBRARIES) \ No newline at end of file diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake index d1958e2ab3..9b8209ef29 100644 --- a/cmake/modules/FindSixense.cmake +++ b/cmake/modules/FindSixense.cmake @@ -36,5 +36,9 @@ endif () include(SelectLibraryConfigurations) select_library_configurations(SIXENSE) +set(SIXENSE_LIBRARIES "${SIXENSE_LIBRARY}") + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SIXENSE DEFAULT_MSG SIXENSE_INCLUDE_DIRS SIXENSE_LIBRARIES) + +mark_as_advanced(SIXENSE_LIBRARIES SIXENSE_INCLUDE_DIRS) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index d6e776aad2..97b6413106 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -222,17 +222,17 @@ endif (SDL_FOUND AND NOT DISABLE_SDL) # and with qxmpp for chat if (QXMPP_FOUND AND NOT DISABLE_QXMPP) add_definitions(-DHAVE_QXMPP -DQXMPP_STATIC) - include_directories(SYSTEM ${QXMPP_INCLUDE_DIR}) + include_directories(SYSTEM "${QXMPP_INCLUDE_DIRS}") - target_link_libraries(${TARGET_NAME} ${QXMPP_LIBRARY}) + target_link_libraries(${TARGET_NAME} ${QXMPP_LIBRARIES}) endif (QXMPP_FOUND AND NOT DISABLE_QXMPP) # and with RtMidi for RtMidi control if (RTMIDI_FOUND AND NOT DISABLE_RTMIDI) add_definitions(-DHAVE_RTMIDI) - include_directories(SYSTEM ${RTMIDI_INCLUDE_DIR}) - target_link_libraries(${TARGET_NAME} "${RTMIDI_LIBRARY}") + include_directories(SYSTEM "${RTMIDI_INCLUDE_DIRS}") + target_link_libraries(${TARGET_NAME} ${RTMIDI_LIBRARIES}) if (APPLE) find_library(CoreMIDI CoreMIDI)