|
@@ -13,6 +13,7 @@ class LibOggConan(ConanFile):
|
|
"free for anyone to use.")
|
|
"free for anyone to use.")
|
|
homepage = "https://www.xiph.org/ogg/"
|
|
homepage = "https://www.xiph.org/ogg/"
|
|
topics = ("xiph.org", "media", "container")
|
|
topics = ("xiph.org", "media", "container")
|
|
|
|
+ exports_sources = ["CMakeLists.txt"]
|
|
settings = "os", "compiler", "build_type", "arch"
|
|
settings = "os", "compiler", "build_type", "arch"
|
|
options = {"shared": [True, False]}
|
|
options = {"shared": [True, False]}
|
|
default_options = {"shared": False}
|
|
default_options = {"shared": False}
|
|
@@ -29,15 +30,15 @@ class LibOggConan(ConanFile):
|
|
del self.settings.compiler.cppstd
|
|
del self.settings.compiler.cppstd
|
|
del self.settings.compiler.libcxx
|
|
del self.settings.compiler.libcxx
|
|
|
|
|
|
- def build(self):
|
|
|
|
|
|
+ def _configure_cmake(self):
|
|
cmake = CMake(self)
|
|
cmake = CMake(self)
|
|
- cmake.configure(source_folder="hello")
|
|
|
|
- cmake.build()
|
|
|
|
|
|
+ cmake.definitions["CONAN_SOURCE_LOCATION"] = self.subfolder
|
|
|
|
+ cmake.configure()
|
|
|
|
+ return cmake
|
|
|
|
|
|
- # Explicit way:
|
|
|
|
- # self.run('cmake %s/hello %s'
|
|
|
|
- # % (self.source_folder, cmake.command_line))
|
|
|
|
- # self.run("cmake --build . %s" % cmake.build_config)
|
|
|
|
|
|
+ def build(self):
|
|
|
|
+ cmake = self._configure_cmake()
|
|
|
|
+ cmake.build()
|
|
|
|
|
|
def package(self):
|
|
def package(self):
|
|
self.copy("*.h", dst="include", src="hello")
|
|
self.copy("*.h", dst="include", src="hello")
|