deterministic libname

conan-io · Dec 16, 2022 · 69e29ab · 69e29ab
1 parent 3e2c346
commit 69e29ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/recipes/jasper/all/conandata.yml b/recipes/jasper/all/conandata.yml
@@ -14,6 +14,9 @@ patches:
     - patch_file: "patches/3.0.6-0002-find-libjpeg.patch"
       patch_description: "check_c_source_compilers does not work with conan gens. See https://github.com/conan-io/conan/issues/12180"
       patch_type: "conan"
+    - patch_file: "patches/3.0.6-0003-deterministic-libname.patch"
+      patch_description: "No generator dependent libname"
+      patch_type: "conan"
   "2.0.33":
     - patch_file: "patches/2.0.33-0001-skip-rpath.patch"
       patch_description: "Do not enforce rpath configuration"

diff --git a/recipes/jasper/all/patches/3.0.6-0003-deterministic-libname.patch b/recipes/jasper/all/patches/3.0.6-0003-deterministic-libname.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -254,7 +254,7 @@ endif()
+ # If a multiconfiguration generator is used, ensure that various output
+ # files are not placed in subdirectories (such as Debug and Release)
+ # as this will cause the CTest test suite to fail.
+-if(JAS_MULTICONFIGURATION_GENERATOR)
++if(0)
+ 	if(CMAKE_CONFIGURATION_TYPES)
+ 		set(CMAKE_DEBUG_POSTFIX d)
+ 	endif()