From ab37f8241d6ce743499da4784b2060e9afaf4ca1 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 19 Apr 2018 12:53:17 +0200 Subject: [PATCH] cmake: fix setting CMAKE_INSTALL_PACKAGEDIR on non-Windows platforms --- CMakeLists.txt | 2 +- cmake/MatroskaConfig.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 cmake/MatroskaConfig.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 96b1137..2dbd533 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ endif() if(NOT DISABLE_CMAKE_CONFIG) if(WIN32) set(CMAKE_INSTALL_PACKAGEDIR cmake) - elseif(WIN32) + else() set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) endif() include(CMakePackageConfigHelpers) diff --git a/cmake/MatroskaConfig.cmake b/cmake/MatroskaConfig.cmake deleted file mode 100644 index e9a88bd..0000000 --- a/cmake/MatroskaConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/MatroskaTargets.cmake) -- 2.50.1