From e8daee013e80178230580754537222f41422c5b6 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Fri, 31 Jul 2015 16:27:10 -0700 Subject: [PATCH] windows finds framework --- cmake/modules/Find3DConnexionClient.cmake | 7 +++---- .../Inc => 3dconnexionclient/include}/I3dMouseParams.h | 0 .../{connexionclient => 3dconnexionclient}/readme.txt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) rename interface/external/{connexionclient/Inc => 3dconnexionclient/include}/I3dMouseParams.h (100%) rename interface/external/{connexionclient => 3dconnexionclient}/readme.txt (65%) diff --git a/cmake/modules/Find3DConnexionClient.cmake b/cmake/modules/Find3DConnexionClient.cmake index ffd6477ae4..eea16dc619 100644 --- a/cmake/modules/Find3DConnexionClient.cmake +++ b/cmake/modules/Find3DConnexionClient.cmake @@ -15,7 +15,7 @@ # include("${MACRO_DIR}/HifiLibrarySearchHints.cmake") -hifi_library_search_hints("connexionclient") +hifi_library_search_hints("3dconnexionclient") if (APPLE) find_library(3DConnexionClient 3DConnexionClient) @@ -24,13 +24,12 @@ if (APPLE) set(3DCONNEXIONCLIENT_INCLUDE_DIRS ${3DConnexionClient}) set(3DCONNEXIONCLIENT_LIBRARY ${3DConnexionClient}) message(STATUS "Found 3DConnexion at " ${3DConnexionClient}) - mark_as_advanced(3DCONNEXIONCLIENT_INCLUDE_DIR CONNEXIONCLIENT_LIBRARY) + mark_as_advanced(3DCONNEXIONCLIENT_INCLUDE_DIR 3DCONNEXIONCLIENT_LIBRARY) else () message(STATUS "Could NOT find 3DConnexionClient") endif() elseif (WIN32) - message(STATUS ${CONNEXIONCLIENT_SEARCH_DIRS}) - find_path(3DCONNEXIONCLIENT_INCLUDE_DIRS I3dMouseParams.h PATH_SUFFIXES Inc HINTS ${CONNEXIONCLIENT_SEARCH_DIRS}) + find_path(3DCONNEXIONCLIENT_INCLUDE_DIRS I3dMouseParams.h PATH_SUFFIXES include HINTS ${3DCONNEXIONCLIENT_SEARCH_DIRS}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(3DConnexionClient DEFAULT_MSG 3DCONNEXIONCLIENT_INCLUDE_DIRS) diff --git a/interface/external/connexionclient/Inc/I3dMouseParams.h b/interface/external/3dconnexionclient/include/I3dMouseParams.h similarity index 100% rename from interface/external/connexionclient/Inc/I3dMouseParams.h rename to interface/external/3dconnexionclient/include/I3dMouseParams.h diff --git a/interface/external/connexionclient/readme.txt b/interface/external/3dconnexionclient/readme.txt similarity index 65% rename from interface/external/connexionclient/readme.txt rename to interface/external/3dconnexionclient/readme.txt index cbfc5a277a..a8014b386d 100644 --- a/interface/external/connexionclient/readme.txt +++ b/interface/external/3dconnexionclient/readme.txt @@ -1,3 +1,3 @@ The Mac version does not require any files. The 3D Connexion driver should be installed from http://www.3dconnexion.eu/service/drivers.html -For Windows the provided header file is required: Inc/I3dMouseParams.h \ No newline at end of file +For Windows the provided header file is required: include/I3dMouseParams.h \ No newline at end of file