From 27c6011e6e45b7d1f6273a01bd7962c2aad79918 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 14 Apr 2017 11:34:52 -0700
Subject: [PATCH] change nvtt external to ignore release type
---
cmake/externals/nvtt/CMakeLists.txt | 8 ++------
cmake/modules/FindNVTT.cmake | 10 +++-------
libraries/image/CMakeLists.txt | 2 +-
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/cmake/externals/nvtt/CMakeLists.txt b/cmake/externals/nvtt/CMakeLists.txt
index a8ba0cb4c1..b2bb0c29fa 100644
--- a/cmake/externals/nvtt/CMakeLists.txt
+++ b/cmake/externals/nvtt/CMakeLists.txt
@@ -24,13 +24,9 @@ if (NOT ANDROID)
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "Location of NVTT include directory")
if (WIN32)
- set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/Debug/x64/nvtt.lib CACHE FILEPATH "Path to NVTT Debug library")
- set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/Release/x64/nvtt.lib CACHE FILEPATH "Path to NVTT Release library")
-
- set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${INSTALL_DIR}/Release/x64 CACHE PATH "Location of NVTT DLL")
- add_paths_to_fixup_libs(${${EXTERNAL_NAME_UPPER}_DLL_PATH})
+ set(${EXTERNAL_NAME_UPPER}_LIBRARY ${INSTALL_DIR}/lib/static/libnvtt.a CACHE FILEPATH "Path to NVTT static library")
else ()
- set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/static/libnvtt.a CACHE FILEPATH "Path to NVTT static library")
+ set(${EXTERNAL_NAME_UPPER}_LIBRARY ${INSTALL_DIR}/lib/static/libnvtt.a CACHE FILEPATH "Path to NVTT static library")
endif ()
endif()
diff --git a/cmake/modules/FindNVTT.cmake b/cmake/modules/FindNVTT.cmake
index 7743610d5a..90a853ccb1 100644
--- a/cmake/modules/FindNVTT.cmake
+++ b/cmake/modules/FindNVTT.cmake
@@ -6,7 +6,7 @@
#
# NVTT_FOUND
# NVTT_INCLUDE_DIRS
-# NVTT_LIBRARIES
+# NVTT_LIBRARY
#
# Created on 4/14/2017 by Stephen Birarda
# Copyright 2017 High Fidelity, Inc.
@@ -20,11 +20,7 @@ hifi_library_search_hints("nvtt")
find_path(NVTT_INCLUDE_DIRS nvtt/nvtt.h PATH_SUFFIXES include HINTS ${NVTT_SEARCH_DIRS})
-find_library(NVTT_LIBRARY_RELEASE nvtt PATH_SUFFIXES "lib/static" "Release/x64" HINTS ${NVTT_SEARCH_DIRS})
-find_library(NVTT_LIBRARY_DEBUG nvtt PATH_SUFFIXES "Debug/x64" HINTS ${NVTT_SEARCH_DIRS})
-
-include(SelectLibraryConfigurations)
-select_library_configurations(NVTT)
+find_library(NVTT_LIBRARY nvtt PATH_SUFFIXES "lib/static" HINTS ${NVTT_SEARCH_DIRS})
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(NVTT DEFAULT_MSG NVTT_INCLUDE_DIRS NVTT_LIBRARIES)
+find_package_handle_standard_args(NVTT DEFAULT_MSG NVTT_INCLUDE_DIRS NVTT_LIBRARY)
diff --git a/libraries/image/CMakeLists.txt b/libraries/image/CMakeLists.txt
index 7b5c505d24..b30e67d9d4 100644
--- a/libraries/image/CMakeLists.txt
+++ b/libraries/image/CMakeLists.txt
@@ -7,4 +7,4 @@ target_glm()
add_dependency_external_projects(nvtt)
find_package(NVTT REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE ${NVTT_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${NVTT_LIBRARIES})
+target_link_libraries(${TARGET_NAME} ${NVTT_LIBRARY})