diff --git a/recipes/clog/build.sh b/recipes/clog/build.sh index 0510a58706bbc..4b7ff373423ca 100644 --- a/recipes/clog/build.sh +++ b/recipes/clog/build.sh @@ -1,6 +1,3 @@ -# Having patches create files is tricky with conda -cp ${RECIPE_DIR}/clog-config.cmake.in deps/clog/cmake/clog-config.cmake.in - cd deps/clog mkdir build cd build diff --git a/recipes/clog/clog-config.cmake.in b/recipes/clog/clog-config.cmake.in deleted file mode 100644 index 1aead0749c26c..0000000000000 --- a/recipes/clog/clog-config.cmake.in +++ /dev/null @@ -1,12 +0,0 @@ -@PACKAGE_INIT@ - -get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -file(GLOB CONFIG_FILES "${_DIR}/clog-config-*.cmake") -foreach(f ${CONFIG_FILES}) - include(${f}) -endforeach() - -# ${_DIR}/clog-targets-*.cmake will be included here -include("${_DIR}/clog-targets.cmake") - -check_required_components(@PROJECT_NAME@) diff --git a/recipes/clog/meta.yaml b/recipes/clog/meta.yaml index b6afd475aeac4..97af8dcd97cce 100644 --- a/recipes/clog/meta.yaml +++ b/recipes/clog/meta.yaml @@ -44,7 +44,6 @@ test: commands: - test -f ${PREFIX}/lib/libclog${SHLIB_EXT} # [unix] - test -f ${PREFIX}/include/clog.h # [unix] - - test -f ${PREFIX}/share/clog/clog-config.cmake # [unix] about: home: https://github.com/pytorch/QNNPACK/tree/master/deps/clog diff --git a/recipes/clog/shared_lib.patch b/recipes/clog/shared_lib.patch index eab70c5dbc6d3..0f8304539f929 100644 --- a/recipes/clog/shared_lib.patch +++ b/recipes/clog/shared_lib.patch @@ -1,5 +1,5 @@ diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt -index ab1840b..596d451 100644 +index ab1840b..15e7f8a 100644 --- a/deps/clog/CMakeLists.txt +++ b/deps/clog/CMakeLists.txt @@ -51,7 +51,7 @@ IF(CLOG_BUILD_TESTS) @@ -11,20 +11,3 @@ index ab1840b..596d451 100644 SET_TARGET_PROPERTIES(clog PROPERTIES C_STANDARD 99 C_EXTENSIONS NO) -@@ -67,6 +67,16 @@ IF(ANDROID AND NOT CLOG_LOG_TO_STDIO) - TARGET_LINK_LIBRARIES(clog PRIVATE log) - ENDIF() - -+ -+# support find_package(clog CONFIG) -+INCLUDE(CMakePackageConfigHelpers) -+GET_FILENAME_COMPONENT(CONFIG_FILE_PATH ${CMAKE_CURRENT_BINARY_DIR}/clog-config.cmake ABSOLUTE) -+CONFIGURE_PACKAGE_CONFIG_FILE( -+ cmake/clog-config.cmake.in ${CONFIG_FILE_PATH} -+ INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) -+INSTALL(FILES ${CONFIG_FILE_PATH} -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) # clog_DIR ${prefix}/share/clog -+ - INSTALL(TARGETS clog - EXPORT cpuinfo-targets - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/recipes/cpuinfo/dont_install_clog.patch b/recipes/cpuinfo/dont_install_clog.patch deleted file mode 100644 index 9501692449bca..0000000000000 --- a/recipes/cpuinfo/dont_install_clog.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt -index ab1840b..696b58b 100644 ---- a/deps/clog/CMakeLists.txt -+++ b/deps/clog/CMakeLists.txt -@@ -67,11 +67,11 @@ IF(ANDROID AND NOT CLOG_LOG_TO_STDIO) - TARGET_LINK_LIBRARIES(clog PRIVATE log) - ENDIF() - --INSTALL(TARGETS clog -- EXPORT cpuinfo-targets -- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -+# INSTALL(TARGETS clog -+# EXPORT cpuinfo-targets -+# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+# PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - - # ---[ clog tests - IF(CLOG_BUILD_TESTS) diff --git a/recipes/cpuinfo/shared_clog.patch b/recipes/cpuinfo/shared_clog.patch index 5465f67871e10..e25ecbed66825 100644 --- a/recipes/cpuinfo/shared_clog.patch +++ b/recipes/cpuinfo/shared_clog.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74364e8..26ff5c2 100644 +index 74364e8..a48671a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -250,17 +250,7 @@ ELSE() +@@ -250,17 +250,6 @@ ELSE() ENDIF() # ---[ cpuinfo dependencies: clog @@ -17,7 +17,6 @@ index 74364e8..26ff5c2 100644 - # We build static version of clog but a dynamic library may indirectly depend on it - SET_PROPERTY(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON) -ENDIF() -+find_package(clog) TARGET_LINK_LIBRARIES(cpuinfo PRIVATE clog) TARGET_LINK_LIBRARIES(cpuinfo_internals PRIVATE clog)