From 063d8fd6c6216623645ddac8ba944827640cbbb1 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 2 Dec 2020 12:20:10 -0600 Subject: [PATCH] Update CMake find modules --- src/cmake/FindLib3ds.cmake | 35 +++++++++++++++-------------------- src/cmake/FindOpenCTM.cmake | 2 +- src/cmake/FindQhull.cmake | 2 +- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/cmake/FindLib3ds.cmake b/src/cmake/FindLib3ds.cmake index d56df0521..4d7c4f614 100644 --- a/src/cmake/FindLib3ds.cmake +++ b/src/cmake/FindLib3ds.cmake @@ -7,7 +7,7 @@ # Original Author: # 2019 Ryan Pavlik # -# Copyright Collabora, Ltd. 2019 +# Copyright 2019, Collabora, Ltd. # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) @@ -16,32 +16,27 @@ set(LIB3DS_ROOT_DIR "${LIB3DS_ROOT_DIR}" - CACHE - PATH - "Directory to search for lib3ds") -find_path(LIB3DS_INCLUDE_DIR - NAMES - lib3ds/types.h - PATHS - "${LIB3DS_ROOT_DIR}") -find_library(LIB3DS_LIBRARY + CACHE PATH "Directory to search for lib3ds") +find_path( + LIB3DS_INCLUDE_DIR + NAMES lib3ds/types.h + PATHS "${LIB3DS_ROOT_DIR}") +find_library( + LIB3DS_LIBRARY NAMES 3ds 3ds-1 - PATHS - "${LIB3DS_ROOT_DIR}") + PATHS "${LIB3DS_ROOT_DIR}") include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Lib3ds - DEFAULT_MSG - LIB3DS_INCLUDE_DIR - LIB3DS_LIBRARY) +find_package_handle_standard_args(LIB3DS DEFAULT_MSG LIB3DS_INCLUDE_DIR + LIB3DS_LIBRARY) if(LIB3DS_FOUND) if(NOT TARGET Lib3ds::Lib3ds) add_library(Lib3ds::Lib3ds UNKNOWN IMPORTED) - set_target_properties(Lib3ds::Lib3ds - PROPERTIES - IMPORTED_LOCATION "${LIB3DS_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${LIB3DS_INCLUDE_DIR}") + set_target_properties( + Lib3ds::Lib3ds + PROPERTIES IMPORTED_LOCATION "${LIB3DS_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${LIB3DS_INCLUDE_DIR}") endif() set(LIB3DS_INCLUDE_DIRS ${LIB3DS_INCLUDE_DIR}) set(LIB3DS_LIBRARIES ${LIB3DS_LIBRARY}) diff --git a/src/cmake/FindOpenCTM.cmake b/src/cmake/FindOpenCTM.cmake index 3cb2b7fe5..9d31412cb 100644 --- a/src/cmake/FindOpenCTM.cmake +++ b/src/cmake/FindOpenCTM.cmake @@ -7,7 +7,7 @@ # Original Author: # 2019 Ryan Pavlik # -# Copyright Collabora, Ltd. 2019 +# Copyright 2019, Collabora, Ltd. # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) diff --git a/src/cmake/FindQhull.cmake b/src/cmake/FindQhull.cmake index 843762eee..07b1c8784 100644 --- a/src/cmake/FindQhull.cmake +++ b/src/cmake/FindQhull.cmake @@ -15,7 +15,7 @@ # Original Author: # 2019 Ryan Pavlik # -# Copyright Collabora, Ltd. 2019 +# Copyright 2019, Collabora, Ltd. # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt)