From ada534d8cfcf1cd5fb190cbe5a29f68d092d6cec Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 26 May 2024 17:23:11 +0200 Subject: [PATCH] odr fix install (#2) --- recipes/odrcore/all/conandata.yml | 38 +++++++++++++++++-- .../1.0.0-0001-fix-cmake-install.patch | 25 ++++++++++++ ...ch => 2.0.0-0001-fix-cmake-uchardet.patch} | 0 .../2.0.0-0002-fix-cmake-install.patch | 20 ++++++++++ .../2.1.0-0001-fix-cmake-install.patch | 20 ++++++++++ .../2.1.1-0001-fix-cmake-install.patch | 20 ++++++++++ .../2.1.2-0001-fix-cmake-install.patch | 20 ++++++++++ .../2.2.0-0001-fix-cmake-install.patch | 20 ++++++++++ .../3.0.0-0001-fix-cmake-install.patch | 16 ++++++++ ...tch => 4.0.0-0001-fix-cmake-utf8cpp.patch} | 0 .../4.0.0-0002-fix-cmake-install.patch | 16 ++++++++ 11 files changed, 191 insertions(+), 4 deletions(-) create mode 100644 recipes/odrcore/all/patches/1.0.0-0001-fix-cmake-install.patch rename recipes/odrcore/all/patches/{2.0.0-0001-fix-cmake.patch => 2.0.0-0001-fix-cmake-uchardet.patch} (100%) create mode 100644 recipes/odrcore/all/patches/2.0.0-0002-fix-cmake-install.patch create mode 100644 recipes/odrcore/all/patches/2.1.0-0001-fix-cmake-install.patch create mode 100644 recipes/odrcore/all/patches/2.1.1-0001-fix-cmake-install.patch create mode 100644 recipes/odrcore/all/patches/2.1.2-0001-fix-cmake-install.patch create mode 100644 recipes/odrcore/all/patches/2.2.0-0001-fix-cmake-install.patch create mode 100644 recipes/odrcore/all/patches/3.0.0-0001-fix-cmake-install.patch rename recipes/odrcore/all/patches/{4.0.0-0001-fix-cmake.patch => 4.0.0-0001-fix-cmake-utf8cpp.patch} (100%) create mode 100644 recipes/odrcore/all/patches/4.0.0-0002-fix-cmake-install.patch diff --git a/recipes/odrcore/all/conandata.yml b/recipes/odrcore/all/conandata.yml index 4333062..c31c559 100644 --- a/recipes/odrcore/all/conandata.yml +++ b/recipes/odrcore/all/conandata.yml @@ -33,11 +33,41 @@ sources: sha256: "b2d671f34bf641d465dfaae9adefdcb4a6210d58a519594a182ba2839531435e" patches: + "1.0.0": + - patch_file: "patches/1.0.0-0001-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" + patch_type: "conan" "2.0.0": - - patch_file: "patches/2.0.0-0001-fix-cmake.patch" - patch_description: "Fix broken dependencies in CMakeLists.txt" + - patch_file: "patches/2.0.0-0001-fix-cmake-uchardet.patch" + patch_description: "Fix broken dependency in CMakeLists.txt" + patch_type: "conan" + - patch_file: "patches/2.0.0-0002-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" + patch_type: "conan" + "2.1.0": + - patch_file: "patches/2.1.0-0001-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" + patch_type: "conan" + "2.1.1": + - patch_file: "patches/2.1.1-0001-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" + patch_type: "conan" + "2.1.2": + - patch_file: "patches/2.1.2-0001-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" + patch_type: "conan" + "2.2.0": + - patch_file: "patches/2.2.0-0001-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" + patch_type: "conan" + "3.0.0": + - patch_file: "patches/3.0.0-0001-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" patch_type: "conan" "4.0.0": - - patch_file: "patches/4.0.0-0001-fix-cmake.patch" - patch_description: "Fix broken dependencies in CMakeLists.txt" + - patch_file: "patches/4.0.0-0001-fix-cmake-utf8cpp.patch" + patch_description: "Fix broken dependency in CMakeLists.txt" + patch_type: "conan" + - patch_file: "patches/4.0.0-0002-fix-cmake-install.patch" + patch_description: "Fix header install in CMakeLists.txt" patch_type: "conan" diff --git a/recipes/odrcore/all/patches/1.0.0-0001-fix-cmake-install.patch b/recipes/odrcore/all/patches/1.0.0-0001-fix-cmake-install.patch new file mode 100644 index 0000000..af8053e --- /dev/null +++ b/recipes/odrcore/all/patches/1.0.0-0001-fix-cmake-install.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a27624..93a9966 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -95,3 +95,20 @@ set_property(TARGET odrlib PROPERTY POSITION_INDEPENDENT_CODE ON) + add_subdirectory("test") + + add_subdirectory("main") ++ ++install( ++ DIRECTORY include/ ++ DESTINATION include/ ++) ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++) ++install( ++ TARGETS odrlib odrmain ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) \ No newline at end of file diff --git a/recipes/odrcore/all/patches/2.0.0-0001-fix-cmake.patch b/recipes/odrcore/all/patches/2.0.0-0001-fix-cmake-uchardet.patch similarity index 100% rename from recipes/odrcore/all/patches/2.0.0-0001-fix-cmake.patch rename to recipes/odrcore/all/patches/2.0.0-0001-fix-cmake-uchardet.patch diff --git a/recipes/odrcore/all/patches/2.0.0-0002-fix-cmake-install.patch b/recipes/odrcore/all/patches/2.0.0-0002-fix-cmake-install.patch new file mode 100644 index 0000000..f3c2c55 --- /dev/null +++ b/recipes/odrcore/all/patches/2.0.0-0002-fix-cmake-install.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 746026d..398f751 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -181,6 +181,15 @@ if (ODR_TEST) + add_subdirectory(test) + endif () + ++install( ++ DIRECTORY include/ ++ DESTINATION include/ ++) ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++) + install( + TARGETS + odr-static \ No newline at end of file diff --git a/recipes/odrcore/all/patches/2.1.0-0001-fix-cmake-install.patch b/recipes/odrcore/all/patches/2.1.0-0001-fix-cmake-install.patch new file mode 100644 index 0000000..9a3f3b4 --- /dev/null +++ b/recipes/odrcore/all/patches/2.1.0-0001-fix-cmake-install.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc99fa9..28bd28a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,6 +195,15 @@ if (ODR_TEST) + add_subdirectory(test) + endif () + ++install( ++ DIRECTORY include/ ++ DESTINATION include/ ++ ) ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++ ) + install( + TARGETS + odr \ No newline at end of file diff --git a/recipes/odrcore/all/patches/2.1.1-0001-fix-cmake-install.patch b/recipes/odrcore/all/patches/2.1.1-0001-fix-cmake-install.patch new file mode 100644 index 0000000..9a3f3b4 --- /dev/null +++ b/recipes/odrcore/all/patches/2.1.1-0001-fix-cmake-install.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc99fa9..28bd28a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,6 +195,15 @@ if (ODR_TEST) + add_subdirectory(test) + endif () + ++install( ++ DIRECTORY include/ ++ DESTINATION include/ ++ ) ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++ ) + install( + TARGETS + odr \ No newline at end of file diff --git a/recipes/odrcore/all/patches/2.1.2-0001-fix-cmake-install.patch b/recipes/odrcore/all/patches/2.1.2-0001-fix-cmake-install.patch new file mode 100644 index 0000000..fc50911 --- /dev/null +++ b/recipes/odrcore/all/patches/2.1.2-0001-fix-cmake-install.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c097cb..7553706 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -192,6 +192,15 @@ if (ODR_TEST) + add_subdirectory(test) + endif () + ++install( ++ DIRECTORY include/ ++ DESTINATION include/ ++ ) ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++ ) + install( + TARGETS + odr \ No newline at end of file diff --git a/recipes/odrcore/all/patches/2.2.0-0001-fix-cmake-install.patch b/recipes/odrcore/all/patches/2.2.0-0001-fix-cmake-install.patch new file mode 100644 index 0000000..e286718 --- /dev/null +++ b/recipes/odrcore/all/patches/2.2.0-0001-fix-cmake-install.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a037876..d51df1c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -189,6 +189,15 @@ if (ODR_TEST) + add_subdirectory(test) + endif () + ++install( ++ DIRECTORY include/ ++ DESTINATION include/ ++ ) ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++ ) + install( + TARGETS + odr \ No newline at end of file diff --git a/recipes/odrcore/all/patches/3.0.0-0001-fix-cmake-install.patch b/recipes/odrcore/all/patches/3.0.0-0001-fix-cmake-install.patch new file mode 100644 index 0000000..be79ae2 --- /dev/null +++ b/recipes/odrcore/all/patches/3.0.0-0001-fix-cmake-install.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 51afb68..be0e892 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -189,6 +189,11 @@ if (ODR_CLANG_TIDY) + add_subdirectory("static_analysis/clang-tidy") + endif () + ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.hpp" ++) + install( + TARGETS + odr \ No newline at end of file diff --git a/recipes/odrcore/all/patches/4.0.0-0001-fix-cmake.patch b/recipes/odrcore/all/patches/4.0.0-0001-fix-cmake-utf8cpp.patch similarity index 100% rename from recipes/odrcore/all/patches/4.0.0-0001-fix-cmake.patch rename to recipes/odrcore/all/patches/4.0.0-0001-fix-cmake-utf8cpp.patch diff --git a/recipes/odrcore/all/patches/4.0.0-0002-fix-cmake-install.patch b/recipes/odrcore/all/patches/4.0.0-0002-fix-cmake-install.patch new file mode 100644 index 0000000..855058c --- /dev/null +++ b/recipes/odrcore/all/patches/4.0.0-0002-fix-cmake-install.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6277ef..557df44 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,6 +209,11 @@ if (ODR_CLANG_TIDY) + add_subdirectory("static_analysis/clang-tidy") + endif () + ++install( ++ DIRECTORY src/ ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.hpp" ++) + install( + TARGETS + odr \ No newline at end of file