Merge pull request #2 from uilianries/jasper-2.0.16

Configure cmake module path for jasper

recipes/jasper/all/CMakeLists.txt

@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(cmake_wrapper)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+include(conanbuildinfo.cmake)
 conan_basic_setup()
 
-include(CMakeLists_original.txt)
+set(CMAKE_MODULE_PATH ${CONAN_CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/source_subfolder/build/cmake/modules ${CMAKE_MODULE_PATH})
+
+add_subdirectory(source_subfolder)

recipes/jasper/all/conanfile.py

@@ -1,6 +1,5 @@
 import glob
 import os
-import shutil
 from conans import ConanFile, CMake, tools
 
 
@@ -25,6 +24,10 @@ class JasperConan(ConanFile):
     def _source_subfolder(self):
         return "source_subfolder"
 
+    @property
+    def _build_subfolder(self):
+        return "build_subfolder"
+
     def requirements(self):
         if self.options.jpegturbo:
             self.requires.add("libjpeg-turbo/2.0.4")
@@ -53,14 +56,10 @@ def _configure_cmake(self):
         self._cmake.definitions["JAS_ENABLE_SHARED"] = self.options.shared
         self._cmake.definitions["JAS_LIBJPEG_REQUIRED"] = "REQUIRED"
         self._cmake.definitions["JAS_ENABLE_OPENGL"] = False
-        self._cmake.configure(source_folder=self._source_subfolder)
+        self._cmake.configure(build_folder=self._build_subfolder)
         return self._cmake
 
     def build(self):
-        os.rename(os.path.join(self._source_subfolder, "CMakeLists.txt"),
-                  os.path.join(self._source_subfolder, "CMakeLists_original.txt"))
-        shutil.copy("CMakeLists.txt",
-                    os.path.join(self._source_subfolder, "CMakeLists.txt"))
         cmake = self._configure_cmake()
         cmake.build()