]> granicus.if.org Git - libmatroska/commitdiff
cmake: fix setting CMAKE_INSTALL_PACKAGEDIR on non-Windows platforms
authorMoritz Bunkus <moritz@bunkus.org>
Thu, 19 Apr 2018 10:53:17 +0000 (12:53 +0200)
committerMoritz Bunkus <moritz@bunkus.org>
Thu, 19 Apr 2018 11:04:11 +0000 (13:04 +0200)
CMakeLists.txt
cmake/MatroskaConfig.cmake [deleted file]

index 96b1137a252fab898e8101341f3be87c805cc179..2dbd533e2808dde48642f27e40dcfc59b695e7e4 100644 (file)
@@ -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 (file)
index e9a88bd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include(${CMAKE_CURRENT_LIST_DIR}/MatroskaTargets.cmake)