From owner-dev-commits-ports-all@freebsd.org Fri Apr 16 18:31:41 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D9B95DAD40; Fri, 16 Apr 2021 18:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FMPtj04Lsz4hQj; Fri, 16 Apr 2021 18:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7BFE1A89; Fri, 16 Apr 2021 18:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13GIVeja093236; Fri, 16 Apr 2021 18:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13GIVe6n093235; Fri, 16 Apr 2021 18:31:40 GMT (envelope-from git) Date: Fri, 16 Apr 2021 18:31:40 GMT Message-Id: <202104161831.13GIVe6n093235@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 1b240c8d4d42 - main - misc/mxnet: don't build the tests if testing is not enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b240c8d4d427bf16a8fc0cf7ad4e831620aa2e6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 18:31:41 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b240c8d4d427bf16a8fc0cf7ad4e831620aa2e6 commit 1b240c8d4d427bf16a8fc0cf7ad4e831620aa2e6 Author: Adriaan de Groot AuthorDate: 2021-04-15 23:15:52 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-16 18:31:06 +0000 misc/mxnet: don't build the tests if testing is not enabled Local (testport) builds were failing like so: ld: error: undefined symbol: testing::Message::GetString() const >>> referenced by base.cc >>> tests/CMakeFiles/mxnet_unit_tests.dir/cpp/misc/base.cc.o:(testing::AssertionResult::AppendMessage(testing::Message const&)) because the testing libraries were not being linked -- because they're not even searched for when testing is not enabled. Extend previous patch that put the searching-for-testlibs behind a check, to apply the same check to building-tests. --- misc/mxnet/files/patch-CMakeLists.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/misc/mxnet/files/patch-CMakeLists.txt b/misc/mxnet/files/patch-CMakeLists.txt index 8c50b22bf675..239130b5f5ee 100644 --- a/misc/mxnet/files/patch-CMakeLists.txt +++ b/misc/mxnet/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-12-13 19:55:11 UTC +--- CMakeLists.txt.orig 2020-07-15 07:03:28 UTC +++ CMakeLists.txt -@@ -490,6 +490,7 @@ if(USE_JEMALLOC) +@@ -464,6 +464,7 @@ if(USE_JEMALLOC) endif() endif() @@ -8,15 +8,15 @@ include(CTest) set(GTEST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest/googletest") set(GTEST_INCLUDE_DIR ${GTEST_ROOT}/include) -@@ -500,6 +501,7 @@ set(GTEST_LIBRARY gtest) +@@ -474,6 +475,7 @@ set(GTEST_LIBRARY gtest) add_subdirectory(${GTEST_ROOT}) find_package(GTest REQUIRED) +endif() # cudnn detection - if(USE_CUDNN AND USE_CUDA) -@@ -819,7 +821,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS} + if(USE_CUDNN) +@@ -865,7 +867,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS} # https://cmake.org/cmake/help/v3.0/module/GNUInstallDirs.html install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dlpack/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) @@ -25,3 +25,13 @@ if(USE_MKLDNN) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/mkldnn/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() +@@ -913,7 +915,9 @@ endif() + if(BUILD_CPP_EXAMPLES) + add_subdirectory(example/image-classification/predict-cpp) + endif() ++if(ENABLE_TESTING) + add_subdirectory(tests) ++endif() + + # ---[ Linter target + if(MSVC)