diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aa9fda2..a573170c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ option(BUILD_ONNX_PYTHON "Build Python binaries" OFF) option(ONNX_GEN_PB_TYPE_STUBS "Generate protobuf python type stubs" ON) option(ONNX_WERROR "Build with Werror" OFF) option(ONNX_COVERAGE "Build with coverage instrumentation" OFF) -option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" OFF) +option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" ON) option(ONNX_USE_LITE_PROTO "Use lite protobuf instead of full." OFF) option(ONNXIFI_ENABLE_EXT "Enable onnxifi extensions." OFF) if(NOT DEFINED ONNX_ML) @@ -82,8 +82,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX") endif() if(ONNX_BUILD_TESTS) - list(APPEND CMAKE_MODULE_PATH ${ONNX_ROOT}/cmake/external) - include(googletest) + find_package(GTest REQUIRED) + if(NOT GTest_FOUND) + message(FATAL_ERROR "cannot find googletest") + endif() endif() if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf)) diff --git a/cmake/unittest.cmake b/cmake/unittest.cmake index e29a93ff..ae146390 100644 --- a/cmake/unittest.cmake +++ b/cmake/unittest.cmake @@ -6,8 +6,8 @@ include(${ONNX_ROOT}/cmake/Utils.cmake) find_package(Threads) -set(${UT_NAME}_libs ${googletest_STATIC_LIBRARIES}) -set(${ONNXIFI_TEST_DRIVER}_libs ${googletest_STATIC_LIBRARIES}) +set(${UT_NAME}_libs ${GTEST_LIBRARIES}) +set(${ONNXIFI_TEST_DRIVER}_libs ${GTEST_LIBRARIES}) list(APPEND ${UT_NAME}_libs onnx) list(APPEND ${UT_NAME}_libs onnx_proto) @@ -31,10 +31,10 @@ function(AddTest) list(REMOVE_DUPLICATES _UT_SOURCES) add_executable(${_UT_TARGET} ${_UT_SOURCES}) - add_dependencies(${_UT_TARGET} onnx onnx_proto googletest) + add_dependencies(${_UT_TARGET} onnx onnx_proto) target_include_directories(${_UT_TARGET} - PUBLIC ${googletest_INCLUDE_DIRS} + PUBLIC ${GTEST_INCLUDE_DIRS} ${ONNX_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS} ${ONNX_ROOT} 9a26c63bf9'>gnu/packages/kerberos.scm
AgeCommit message (Expand)Author
2023-06-04gnu: heimdal: Drop obsolete and insecure user tools....According to messages from the Heimdal maintainers Brian May and Nico Williams, no one should be using their version of 'su' anymore. It was deleted from the development branch five years ago [1] and is only being shipped because the 7.8.0 is based on an older, stable branch. [1] https://github.com/heimdal/heimdal/commit/8a77f45aff366b1cd8c70c43ce63eb16a0c9839c Following the directions from the maintainers, this commit drops all executables built from the ./appl folder via deletion of that SUBDIR from the top-level Makefile.am. Unfortunately, the heimdal-discuss mailing list does not appear to have a public archive. The relevant SMTP Message-Id was: <MDAEMON-F202305111940.AA401569md5001000003030@sequoia-grove.ad.secure-endpoints.com> * gnu/packages/kerberos.scm (heimdal): Drop obsolete and insecure user tools. Signed-off-by: Josselin Poiret <dev@jpoiret.xyz> Felix Lechner
2023-06-04gnu: heimdal: Run autoreconf....* gnu/packages/kerberos.scm (heimdal): Run autoreconf. Signed-off-by: Josselin Poiret <dev@jpoiret.xyz> Felix Lechner
2023-04-14Merge branch 'master' into core-updates....Conflicts: gnu/local.mk gnu/packages/build-tools.scm gnu/packages/certs.scm gnu/packages/check.scm gnu/packages/compression.scm gnu/packages/cups.scm gnu/packages/fontutils.scm gnu/packages/gnuzilla.scm gnu/packages/guile.scm gnu/packages/ibus.scm gnu/packages/image-processing.scm gnu/packages/linux.scm gnu/packages/music.scm gnu/packages/nss.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/qt.scm gnu/packages/ruby.scm gnu/packages/shells.scm gnu/packages/tex.scm gnu/packages/video.scm gnu/packages/vulkan.scm gnu/packages/web.scm gnu/packages/webkit.scm gnu/packages/wm.scm Maxim Cournoyer
2023-04-11gnu: heimdal: Enable OpenLDAP support....* gnu/packages/kerberos.scm (heimdal) [native-inputs]: Add bison, flex and pkg-config. [inputs]: Remove mit-krb5. Add libcap-ng and openldap. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Felix Lechner
2023-04-11gnu: heimdal: Apply patch to fix CVE-2022-45142....Several recent Heimdal releases are affected by the serious vulnerability CVE-2022-45142, which NIST scored as "7.5 HIGH". [1] At the time of writing, the upstream developers had not yet cut any releases post-7.8.0, which is why the patch is being applied here. The patch was extracted from Helmut Grohne's public vulnerability disclosure. [2] [1] https://nvd.nist.gov/vuln/detail/CVE-2022-45142 [2] https://www.openwall.com/lists/oss-security/2023/02/08/1 * gnu/packages/patches/heimdal-CVE-2022-45142.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/kerberos.scm (heimdal)[source]: Apply it. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Felix Lechner
2023-04-11gnu: heimdal: Update to 7.8.0 [fixes CVE-2022-44640]....* gnu/packages/kerberos.scm (heimdal): Update to 7.8.0. [source]: Adjust date in snippet. [native-inputs]: Add python. Remove perl. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Felix Lechner