Merge pull request #1044 from trassir/add-conanfile-jsoncpp-1.8.3

Update conanfile for building jsoncpp 1.8.3
conan-io · Mar 24, 2020 · c29df5b · c29df5b
2 parents 28e3133 + c63bd36
commit c29df5b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/recipes/jsoncpp/all/conandata.yml b/recipes/jsoncpp/all/conandata.yml
@@ -5,3 +5,6 @@ sources:
   "1.9.2":
     url: https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz
     sha256: 77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0
+  "1.8.3":
+    url: https://github.com/open-source-parsers/jsoncpp/archive/1.8.3.tar.gz
+    sha256: 3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f
diff --git a/recipes/jsoncpp/all/conanfile.py b/recipes/jsoncpp/all/conanfile.py
@@ -39,9 +39,10 @@ def _patch_sources(self):
             tools.replace_in_file(os.path.join(self._source_subfolder, "src", "lib_json", "CMakeLists.txt"),
                                   "set_target_properties( jsoncpp_lib PROPERTIES POSITION_INDEPENDENT_CODE ON)",
                                   "set_target_properties( jsoncpp_lib PROPERTIES POSITION_INDEPENDENT_CODE OFF)")
-        tools.replace_in_file(os.path.join(self._source_subfolder, "src", "lib_json", "CMakeLists.txt"),
-                              "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/json>",
-                              "")
+        if tools.Version(self.version) > "1.9.0":
+            tools.replace_in_file(os.path.join(self._source_subfolder, "src", "lib_json", "CMakeLists.txt"),
+                                  "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/json>",
+                                  "")
         tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"),
                               "add_subdirectory( example )",
                               "",

diff --git a/recipes/jsoncpp/all/test_package/CMakeLists.txt b/recipes/jsoncpp/all/test_package/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(test_package)
 cmake_minimum_required(VERSION 2.8.12)
+project(test_package)
 
 SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/recipes/jsoncpp/config.yml b/recipes/jsoncpp/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.8.3":
+    folder: all
   "1.9.1":
     folder: all
   "1.9.2":