diff --git a/recipe/meta.yaml b/recipe/meta.yaml index baa17c2..5e8a93d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "CppInterOp" %} -{% set build_number = 1 %} -{% set version = "1.1.0" %} +{% set build_number = 0 %} +{% set version = "1.2.0" %} {% set revision_tag = "v"+version %} package: @@ -9,12 +9,8 @@ package: source: - url: https://github.com/compiler-research/CppInterOp/archive/refs/tags/{{ revision_tag }}.tar.gz - sha256: 29377ba4fecd82395efd2fefcaa911fe72396d78293607852bd0e9b9ab65d1dc + sha256: b3cf25f500624fe12ffc40f858a04c46daea808298e64d924b594eb35ca1c806 folder: cppinterop - patches: - - patches/cppinterop/cppinterop-1.1.0-0001-cppinterop-Add-missing-dependencies.patch - - path: patches - folder: add_patches build: skip: true # [win] diff --git a/recipe/patches/cppinterop/cppinterop-1.1.0-0001-cppinterop-Add-missing-dependencies.patch b/recipe/patches/cppinterop/cppinterop-1.1.0-0001-cppinterop-Add-missing-dependencies.patch deleted file mode 100644 index 81151cd..0000000 --- a/recipe/patches/cppinterop/cppinterop-1.1.0-0001-cppinterop-Add-missing-dependencies.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/lib/Interpreter/CMakeLists.txt b/lib/Interpreter/CMakeLists.txt -index 5c0b2730..028ee567 100644 ---- a/lib/Interpreter/CMakeLists.txt -+++ b/lib/Interpreter/CMakeLists.txt -@@ -76,6 +76,12 @@ if (LLVM_LINK_LLVM_DYLIB) - FrontendHLSL - LTO - ) -+ # We will need to append the missing dependencies to pull in the right -+ # LLVM library dependencies. -+ list(APPEND link_libs -+ clangCodeGen -+ clangStaticAnalyzerCore -+ ) - endif(LLVM_LINK_LLVM_DYLIB) - - add_llvm_library(clangCppInterOp diff --git a/recipe/patches/cppinterop/cppinterop-1.1.0-0002-cppinterop-Move-cmake-config-files.patch b/recipe/patches/cppinterop/cppinterop-1.1.0-0002-cppinterop-Move-cmake-config-files.patch deleted file mode 100644 index 95dd872..0000000 --- a/recipe/patches/cppinterop/cppinterop-1.1.0-0002-cppinterop-Move-cmake-config-files.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2e215b73..6b85b2c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,15 +319,15 @@ set(CPPINTEROP_VERSION_MINOR "${CMAKE_MATCH_2}") - set(CPPINTEROP_VERSION_PATCH "${CMAKE_MATCH_3}") - - configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppInterOpConfig.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOpConfig.cmake -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppInterOp/CppInterOpConfig.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOp/CppInterOpConfig.cmake - @ONLY) - configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppInterOpConfigVersion.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOpConfigVersion.cmake -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppInterOp/CppInterOpConfigVersion.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOp/CppInterOpConfigVersion.cmake - @ONLY) --install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/ -- DESTINATION lib/cmake -+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOp -+ DESTINATION lib/cmake/CppInterOp - FILES_MATCHING - PATTERN "*.cmake" - ) -diff --git a/cmake/CppInterOpConfig.cmake.in b/cmake/CppInterOp/CppInterOpConfig.cmake.in -similarity index 93% -rename from cmake/CppInterOpConfig.cmake.in -rename to cmake/CppInterOp/CppInterOpConfig.cmake.in -index 29e3fb20..f1bc63de 100644 ---- a/cmake/CppInterOpConfig.cmake.in -+++ b/cmake/CppInterOp/CppInterOpConfig.cmake.in -@@ -4,6 +4,7 @@ - get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) - get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}" PATH) - get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}" PATH) -+get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}" PATH) - - ### build/install workaround - -diff --git a/cmake/CppInterOpConfigVersion.cmake.in b/cmake/CppInterOp/CppInterOpConfigVersion.cmake.in -similarity index 100% -rename from cmake/CppInterOpConfigVersion.cmake.in -rename to cmake/CppInterOp/CppInterOpConfigVersion.cmake.in diff --git a/recipe/patches/cppinterop/cppinterop-1.1.0-0003-cppinterop-Fix-Cmake-package-return-info.patch b/recipe/patches/cppinterop/cppinterop-1.1.0-0003-cppinterop-Fix-Cmake-package-return-info.patch deleted file mode 100644 index 2fc2dac..0000000 --- a/recipe/patches/cppinterop/cppinterop-1.1.0-0003-cppinterop-Fix-Cmake-package-return-info.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6b85b2c0..d8b340a4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -312,7 +312,7 @@ include_directories(BEFORE SYSTEM - ) - - --file(READ "VERSION" CPPINTEROP_VERSION) -+file(STRINGS "VERSION" CPPINTEROP_VERSION) - string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*)" CPPINTEROP_VERSION_ONLY "${CPPINTEROP_VERSION}") - set(CPPINTEROP_VERSION_MAJOR "${CMAKE_MATCH_1}") - set(CPPINTEROP_VERSION_MINOR "${CMAKE_MATCH_2}") -diff --git a/cmake/CppInterOp/CppInterOpConfig.cmake.in b/cmake/CppInterOp/CppInterOpConfig.cmake.in -index f1bc63de..51f59ef0 100644 ---- a/cmake/CppInterOp/CppInterOpConfig.cmake.in -+++ b/cmake/CppInterOp/CppInterOpConfig.cmake.in -@@ -10,14 +10,16 @@ get_filename_component(CPPINTEROP_INSTALL_PREFIX "${CPPINTEROP_INSTALL_PREFIX}" - - if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/include") - set(_include "${CPPINTEROP_INSTALL_PREFIX}/include") -+ set(_libs "${CPPINTEROP_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangCppInterOp${CMAKE_SHARED_LIBRARY_SUFFIX}") - else() - set(_include "@CMAKE_CURRENT_SOURCE_DIR@/include") -+ set(_libs "@CMAKE_CURRENT_SOURCE_DIR@/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clangCppInterOp${CMAKE_SHARED_LIBRARY_SUFFIX}") - endif() - --if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/cmake") -- set(_cmake "${CPPINTEROP_INSTALL_PREFIX}/cmake") -+if (IS_DIRECTORY "${CPPINTEROP_INSTALL_PREFIX}/lib/cmake/CppInterOp") -+ set(_cmake "${CPPINTEROP_INSTALL_PREFIX}/lib/cmake/CppInterOp") - else() -- set(_cmake "@CMAKE_CURRENT_SOURCE_DIR@/cmake") -+ set(_cmake "@CMAKE_CURRENT_SOURCE_DIR@/cmake/CppInterOp") - endif() - - ### -@@ -25,11 +27,13 @@ endif() - set(CPPINTEROP_EXPORTED_TARGETS "clangCppInterOp") - set(CPPINTEROP_CMAKE_DIR "${_cmake}") - set(CPPINTEROP_INCLUDE_DIRS "${_include}") -+set(CPPINTEROP_LIBRARIES "${_libs}") - - # Provide all our library targets to users. - add_library(clangCppInterOp SHARED IMPORTED) --set_property(TARGET clangCppInterOp PROPERTY IMPORTED_LOCATION "${CPPINTEROP_DIR}/lib/libclangCppInterOp.so") - set_property(TARGET clangCppInterOp PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_include}") -+set_property(TARGET clangCppInterOp PROPERTY IMPORTED_LOCATION "${_libs}") - --unset(_include) - unset(_cmake) -+unset(_include) -+unset(_libs)