]> granicus.if.org Git - libmatroska/commitdiff
Remove explict CMAKE_MODULE_PATH set
authorMatt Schulte <maschu@microsoft.com>
Fri, 19 Oct 2018 16:56:19 +0000 (09:56 -0700)
committerMatt Schulte <maschu@microsoft.com>
Fri, 19 Oct 2018 16:56:19 +0000 (09:56 -0700)
Currently, CMAKE_MODULE_PATH is expliclty overridden and set to
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/". Since that directory does not
exist this prevents anyone from writing a FindEbml.cmake file. This
works if you are consuming libeml by installing it on your system.

This breaks the use case of having libebml built as part of your build.
If you have called add_subdirectory(libebml) already, the build should
be able to continue. I'm removing the explict set of CMAKE_MODULE_PATH
to allow this use case.

CMakeLists.txt

index f204a5dfa70890509e8934c1bca62f773b84dd15..33ad46cdb81fafac2740ca919cea77b5e748c192 100644 (file)
@@ -5,7 +5,6 @@ project(matroska VERSION 1.4.9)
 option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
 option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF)
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 find_package(Ebml 1.3.5 REQUIRED)
 
 include(GNUInstallDirs)