Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bcunit for openSUSE:Factory checked in at 2024-03-14 17:44:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bcunit (Old) and /work/SRC/openSUSE:Factory/.bcunit.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcunit" Thu Mar 14 17:44:47 2024 rev:7 rq:1157858 version:5.3.26 Changes: -------- --- /work/SRC/openSUSE:Factory/bcunit/bcunit.changes 2023-10-19 22:51:34.763702330 +0200 +++ /work/SRC/openSUSE:Factory/.bcunit.new.1905/bcunit.changes 2024-03-14 17:46:02.411546309 +0100 @@ -1,0 +2,11 @@ +Thu Mar 7 06:38:47 UTC 2024 - Paolo Stivanin <[email protected]> + +- Update to 5.3.26 (no changelog). + +------------------------------------------------------------------- +Mon Jan 15 07:54:35 UTC 2024 - Paolo Stivanin <[email protected]> + +- Update to 5.3.7 (no changelog). +- Disable NCurses since it doesn't build. + +------------------------------------------------------------------- Old: ---- bcunit-5.2.62.tar.bz2 New: ---- bcunit-5.3.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bcunit.spec ++++++ --- /var/tmp/diff_new_pack.aHLVXk/_old 2024-03-14 17:46:08.943786570 +0100 +++ /var/tmp/diff_new_pack.aHLVXk/_new 2024-03-14 17:46:08.947786717 +0100 @@ -1,7 +1,7 @@ # # spec file for package bcunit # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define soname libbcunit %define sover 1 Name: bcunit -Version: 5.2.62 +Version: 5.3.26 Release: 0 Summary: Provide C programmers basic testing functionality License: LGPL-2.0-or-later @@ -34,9 +34,8 @@ Patch2: bcunit-sover.patch # PATCH-FIX-UPSTREAM Patch3: set_current_version.patch -BuildRequires: cmake +BuildRequires: cmake >= 3.22 BuildRequires: git-core >= 1.7.10 -BuildRequires: ncurses-devel BuildRequires: pkgconfig %description @@ -76,9 +75,7 @@ %build %cmake \ - -DENABLE_STATIC=OFF \ - -DENABLE_CURSES=ON \ - -DENABLE_DOC=ON + -DENABLE_BCUNIT_DOC=ON %cmake_build %install @@ -96,16 +93,16 @@ %files doc %dir %{_datadir}/BCUnit/ -%dir %{_datadir}/doc/BCUnit/ -%doc %{_datadir}/doc/BCUnit/* -%doc %{_datadir}/BCUnit/* -%{_mandir}/man3/BCUnit.3%{?ext_man} +%{_datadir}/BCUnit/*dtd +%{_datadir}/BCUnit/*xsl +%{_datadir}/man/man3/BCUnit.3.gz %files devel +%dir %{_datadir}/BCUnit/ +%dir %{_datadir}/BCUnit/cmake %{_includedir}/BCUnit/ -%dir %{_datadir}/BCunit/ %{_libdir}/BCUnit/ %{_libdir}/%{soname}.so %{_libdir}/pkgconfig/bcunit.pc -%{_datadir}/BCunit/cmake/ +%{_datadir}/BCUnit/cmake/* ++++++ bcunit-5.2.62.tar.bz2 -> bcunit-5.3.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/.gitignore new/bcunit-5.3.26/.gitignore --- old/bcunit-5.2.62/.gitignore 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/.gitignore 2023-11-23 11:25:00.000000000 +0100 @@ -1,4 +1,3 @@ -*.in INSTALL configure depcomp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/BCUnit/Headers/CMakeLists.txt new/bcunit-5.3.26/BCUnit/Headers/CMakeLists.txt --- old/bcunit-5.2.62/BCUnit/Headers/CMakeLists.txt 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/BCUnit/Headers/CMakeLists.txt 2023-11-23 11:25:00.000000000 +0100 @@ -28,19 +28,19 @@ set(HEADER_FILES ${FRAMEWORK_INCLUDES}) -if(ENABLE_BASIC) +if(ENABLE_BCUNIT_BASIC) list(APPEND HEADER_FILES ${BASIC_INCLUDES}) endif() -if(ENABLE_CONSOLE) +if(ENABLE_BCUNIT_CONSOLE) list(APPEND HEADER_FILES ${CONSOLE_INCLUDES}) endif() -if(ENABLE_AUTOMATED) +if(ENABLE_BCUNIT_AUTOMATED) list(APPEND HEADER_FILES ${AUTOMATED_INCLUDES}) endif() -if(ENABLE_CURSES) +if(ENABLE_BCUNIT_CURSES) list(APPEND HEADER_FILES ${CURSES_INCLUDES}) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/BCUnit/Headers/TestDB.h new/bcunit-5.3.26/BCUnit/Headers/TestDB.h --- old/bcunit-5.2.62/BCUnit/Headers/TestDB.h 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/BCUnit/Headers/TestDB.h 2023-11-23 11:25:00.000000000 +0100 @@ -161,6 +161,7 @@ unsigned int uiNumberOfTestsFailed; /**< Number of failed tests in the suite. */ unsigned int uiNumberOfTestsSuccess; /**< Number of success tests in the suite. */ + void * pUserData; /**< Pointer to application data */ } CU_Suite; typedef CU_Suite* CU_pSuite; /**< Pointer to a BCUnit suite. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/BCUnit/Sources/CMakeLists.txt new/bcunit-5.3.26/BCUnit/Sources/CMakeLists.txt --- old/bcunit-5.2.62/BCUnit/Sources/CMakeLists.txt 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/BCUnit/Sources/CMakeLists.txt 2023-11-23 11:25:00.000000000 +0100 @@ -1,6 +1,6 @@ ############################################################################ # CMakeLists.txt -# Copyright (C) 2010-2021 Belledonne Communications, Grenoble France +# Copyright (C) 2010-2023 Belledonne Communications, Grenoble France # ############################################################################ # @@ -114,7 +114,7 @@ set(SOURCE_FILES ${FRAMEWORK_SOURCE_FILES}) source_group(framework FILES ${FRAMEWORK_SOURCE_FILES}) -if(ENABLE_BASIC) +if(ENABLE_BCUNIT_BASIC) list(APPEND SOURCE_FILES ${BASIC_SOURCE_FILES}) source_group(basic FILES ${BASIC_SOURCE_FILES}) set(BASIC_SYMBOLS " @@ -127,7 +127,7 @@ CU_set_trace_handler ") endif() -if(ENABLE_AUTOMATED) +if(ENABLE_BCUNIT_AUTOMATED) list(APPEND SOURCE_FILES ${AUTOMATED_SOURCE_FILES}) source_group(automated FILES ${AUTOMATED_SOURCE_FILES}) set(AUTOMATED_SYMBOLS " @@ -138,14 +138,14 @@ CU_set_output_filename ") endif() -if(ENABLE_CONSOLE) +if(ENABLE_BCUNIT_CONSOLE) list(APPEND SOURCE_FILES ${CONSOLE_SOURCE_FILES}) source_group(console FILES ${CONSOLE_SOURCE_FILES}) set(CONSOLE_SYMBOLS " CU_console_run_tests ") endif() -if(ENABLE_CURSES) +if(ENABLE_BCUNIT_CURSES) list(APPEND SOURCE_FILES ${CURSES_SOURCE_FILES}) source_group(curses FILES ${CURSES_SOURCE_FILES}) endif() @@ -155,55 +155,41 @@ endif() -if(ENABLE_STATIC) - add_library(bcunit-static STATIC ${SOURCE_FILES}) - set_target_properties(bcunit-static PROPERTIES OUTPUT_NAME bcunit) - if(ANDROID) - target_link_libraries(bcunit-static INTERFACE "log") - endif() - if(CURSES_LIBRARIES) - target_link_libraries(bcunit-static INTERFACE ${CURSES_LIBRARIES}) - endif() - target_include_directories(bcunit-static PUBLIC - $<INSTALL_INTERFACE:include> - $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/BCUnit/Headers> - $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/BCUnit/Headers> - ) - install(TARGETS bcunit-static EXPORT BcUnitTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) -endif() -if(ENABLE_SHARED) - add_library(bcunit SHARED ${SOURCE_FILES}) - set_target_properties(bcunit PROPERTIES VERSION 1.0.1) - target_compile_definitions(bcunit INTERFACE "$<BUILD_INTERFACE:IN_BCUNIT_SOURCES>") - target_include_directories(bcunit PUBLIC - $<INSTALL_INTERFACE:include> - $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/BCUnit/Headers> - $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/BCUnit/Headers> - ) - if(CURSES_LIBRARIES) - target_link_libraries(bcunit ${CURSES_LIBRARIES}) - endif() - if(MSVC) - if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - install(FILES $<TARGET_PDB_FILE:bcunit> - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - endif() +add_library(bcunit ${SOURCE_FILES}) +target_include_directories(bcunit PUBLIC + $<INSTALL_INTERFACE:include> + $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/BCUnit/Headers> + $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/BCUnit/Headers> +) +set_target_properties(bcunit PROPERTIES VERSION 1.0.1) + +if(ANDROID) + target_link_libraries(bcunit PUBLIC "log") +endif() +if(CURSES_LIBRARIES) + target_link_libraries(bcunit INTERFACE ${CURSES_LIBRARIES}) +endif() +target_compile_definitions(bcunit INTERFACE "$<BUILD_INTERFACE:BCUNIT_USE_BUILD_INTERFACE>") + + +install(TARGETS bcunit EXPORT ${PROJECT_NAME}Targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +) + +if(MSVC AND BUILD_SHARED_LIBS) + if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + install(FILES $<TARGET_PDB_FILE:bcunit> + DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) endif() - install(TARGETS bcunit EXPORT BcUnitTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) endif() -if(ENABLE_TEST) +if(ENABLE_BCUNIT_TEST) add_library(bcunit_test STATIC ${FRAMEWORK_SOURCE_FILES}) target_compile_definitions(bcunit_test PUBLIC MEMTRACE BCUNIT_BUILD_TESTS BCUNIT_DO_NOT_DEFINE_UNLESS_BUILDING_TESTS) target_include_directories(bcunit_test PUBLIC Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/BCUnitConfig.cmake.in new/bcunit-5.3.26/BCUnitConfig.cmake.in --- old/bcunit-5.2.62/BCUnitConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/bcunit-5.3.26/BCUnitConfig.cmake.in 2023-11-23 11:25:00.000000000 +0100 @@ -0,0 +1,53 @@ +############################################################################ +# BCUnitConfig.cmake.in +# Copyright (C) 2015-2023 Belledonne Communications, Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +############################################################################ +# +# Config file for the bcunit package. +# +# Targets +# ^^^^^^^ +# +# The following targets are defined: +# bcunit - The bcunit library target +# +# +# Result variables +# ^^^^^^^^^^^^^^^^ +# +# This config file will set the following variables in your project: +# +# BCUnit_FOUND - The bcunit library has been found +# BCUnit_TARGET - The name of the CMake target for the bcunit library + + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/BCUnitTargets.cmake") + +set(BCUnit_TARGET bcunit) + +# We must propagate the public dependencies and the private dependencies for static build +include(CMakeFindDependencyMacro) +if(@CURSES_FOUND@) + find_dependency(Curses) +endif() + +check_required_components(BCUnit) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/BcUnitConfig.cmake.in new/bcunit-5.3.26/BcUnitConfig.cmake.in --- old/bcunit-5.2.62/BcUnitConfig.cmake.in 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/BcUnitConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -############################################################################ -# BcUnitConfig.cmake.in -# Copyright (C) 2015 Belledonne Communications, Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -############################################################################ -# -# Config file for the bcunit package. -# -# It defines the following variables: -# -# BCUNIT_FOUND - system has bcunit -# BCUNIT_INCLUDE_DIRS - the bcunit include directory -# BCUNIT_LIBRARIES - The libraries needed to use bcunit - -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/BcUnitTargets.cmake") - -if(@ENABLE_SHARED@) - set(BCUNIT_TARGETNAME bcunit) - set(BCUNIT_LIBRARIES ${BCUNIT_TARGETNAME}) -else() - set(BCUNIT_TARGETNAME bcunit-static) - get_target_property(BCUNIT_LIBRARIES ${BCUNIT_TARGETNAME} LOCATION) - get_target_property(BCUNIT_LINK_LIBRARIES ${BCUNIT_TARGETNAME} INTERFACE_LINK_LIBRARIES) - if(BCUNIT_LINK_LIBRARIES) - list(APPEND BCUNIT_LIBRARIES ${BCUNIT_LINK_LIBRARIES}) - endif() -endif() -get_target_property(BCUNIT_INCLUDE_DIRS ${BCUNIT_TARGETNAME} INTERFACE_INCLUDE_DIRECTORIES) -if(NOT BCUNIT_INCLUDE_DIRS) - set(BCUNIT_INCLUDE_DIRS ) -endif() - -set(BCUNIT_FOUND 1) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/CMakeLists.txt new/bcunit-5.3.26/CMakeLists.txt --- old/bcunit-5.2.62/CMakeLists.txt 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/CMakeLists.txt 2023-11-23 11:25:00.000000000 +0100 @@ -20,120 +20,96 @@ # ############################################################################ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.22) + +project(BCUnit VERSION "3.0.2" LANGUAGES C) -# CMP0077 policy is required by Flexisip build. Remove it once the CMake required -# version is higer or equal to 3.13. -if(NOT CMAKE_VERSION VERSION_LESS 3.13) - cmake_policy(SET CMP0077 NEW) -endif() - -project(BCunit C) - -set(PACKAGE "BCUnit") -set(PACKAGE_NAME "${PACKAGE}") -set(PROJECT_VERSION_MAJOR 3) -set(PROJECT_VERSION_MINOR 0) -set(PROJECT_VERSION_PATCH 2) -set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") set(VERSION "${PROJECT_VERSION}") set(RELEASE "${PROJECT_VERSION_PATCH}") -set(PACKAGE_VERSION "${VERSION}-${RELEASE}") -set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -set(PACKAGE_BUGREPORT "") -set(PACKAGE_TARNAME "bcunit") -set(PACKAGE_URL "") - - -option(ENABLE_SHARED "Build shared library." YES) -option(ENABLE_STATIC "Build static library." YES) - -option(ENABLE_AUTOMATED "Compile BCUnit automated interface" ON) -option(ENABLE_BASIC "Compile BCUnit basic interface" ON) -option(ENABLE_CONSOLE "Compile BCUnit console interface" ON) -option(ENABLE_CURSES "Compile BCUnit curses interface" OFF) -option(ENABLE_DOC "Install BCUnit documentation" OFF) -option(ENABLE_EXAMPLES "Compile BCUnit example programs" OFF) -option(ENABLE_TEST "Compile BCUnit internal test program" OFF) -option(ENABLE_MEMTRACE "Enable BCUnit internal memory tracking" OFF) -option(ENABLE_DEPRECATED "Enable use of deprecated v1.1 names" OFF) + + +option(ENABLE_BCUNIT_AUTOMATED "Compile BCUnit automated interface" ON) +option(ENABLE_BCUNIT_BASIC "Compile BCUnit basic interface" ON) +option(ENABLE_BCUNIT_CONSOLE "Compile BCUnit console interface" ON) +option(ENABLE_BCUNIT_CURSES "Compile BCUnit curses interface" OFF) +option(ENABLE_BCUNIT_DOC "Install BCUnit documentation" OFF) +option(ENABLE_BCUNIT_EXAMPLES "Compile BCUnit example programs" OFF) +option(ENABLE_BCUNIT_TEST "Compile BCUnit internal test program" OFF) +option(ENABLE_BCUNIT_MEMTRACE "Enable BCUnit internal memory tracking" OFF) +option(ENABLE_BCUNIT_DEPRECATED "Enable use of deprecated v1.1 names" OFF) set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}") set(CMAKE_REQUIRED_LINK_OPTIONS "${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE}}") include(GNUInstallDirs) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +configure_file(${PROJECT_SOURCE_DIR}/config.h.cmake ${PROJECT_BINARY_DIR}/config.h) set(exec_prefix ${CMAKE_INSTALL_BINDIR}) set(libdir ${CMAKE_INSTALL_LIBDIR}) set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bcunit.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bcunit.pc) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bcunit.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +configure_file(${PROJECT_SOURCE_DIR}/bcunit.pc.in ${PROJECT_BINARY_DIR}/bcunit.pc) +install(FILES ${PROJECT_BINARY_DIR}/bcunit.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) if(MSVC) - add_definitions("/W3") + add_compile_options(/wd4477) else() - add_definitions("-Wall -W -pedantic -Wshadow -ansi -std=c99") + add_compile_options(-Wall -W -pedantic -Wshadow -ansi -std=c99) + # Do not show warnings when building this code + add_compile_options(-Wno-clobbered -Wno-format -Wno-format-security -Wno-unused-parameter -Wno-unused-variable -Wno-pedantic) endif() -if(ENABLE_MEMTRACE) - add_definitions(-DMEMTRACE) +if(ENABLE_BCUNIT_MEMTRACE) + add_compile_definitions("MEMTRACE") endif() -if(ENABLE_DEPRECATED) - add_definitions(-DUSE_DEPRECATED_BCUNIT_NAMES) +if(ENABLE_BCUNIT_DEPRECATED) + add_compile_definitions("USE_DEPRECATED_BCUNIT_NAMES") endif() -if(ENABLE_CURSES) +if(ENABLE_BCUNIT_CURSES) set(CURSES_NEED_NCURSES 1) find_package(Curses) if(NOT CURSES_FOUND) message("Disabling curses as it has not been found!") - set(ENABLE_CURSES 0) + set(ENABLE_BCUNIT_CURSES 0) endif() endif() add_subdirectory(build) -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} -) +include_directories(${PROJECT_BINARY_DIR}) add_subdirectory(BCUnit) -if(ENABLE_DOC) - add_subdirectory(doc) +if(ENABLE_BCUNIT_DOC) add_subdirectory(Man) endif() add_subdirectory(Share) -if(ENABLE_EXAMPLES) +if(ENABLE_BCUNIT_EXAMPLES) add_subdirectory(Examples) endif() include(CMakePackageConfigHelpers) -set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake") -write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/BcUnitConfigVersion.cmake" - VERSION ${PACKAGE_VERSION} - COMPATIBILITY AnyNewerVersion +set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake") +configure_package_config_file("${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}" + NO_SET_AND_CHECK_MACRO ) -export(EXPORT BcUnitTargets - FILE "${CMAKE_CURRENT_BINARY_DIR}/BcUnitTargets.cmake" +write_basic_package_version_file("${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${PROJECT_VERSION} + COMPATIBILITY AnyNewerVersion ) - -configure_package_config_file(BcUnitConfig.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/BcUnitConfig.cmake" - INSTALL_DESTINATION ${CONFIG_PACKAGE_LOCATION} - NO_SET_AND_CHECK_MACRO +install(FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION ${CMAKE_MODULES_INSTALL_DIR} ) -install(EXPORT BcUnitTargets - FILE BcUnitTargets.cmake - DESTINATION ${CONFIG_PACKAGE_LOCATION} +export(EXPORT ${PROJECT_NAME}Targets + FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" ) -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/BcUnitConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/BcUnitConfigVersion.cmake" - DESTINATION ${CONFIG_PACKAGE_LOCATION} +install(EXPORT ${PROJECT_NAME}Targets + FILE "${PROJECT_NAME}Targets.cmake" + DESTINATION ${CMAKE_MODULES_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/Examples/CMakeLists.txt new/bcunit-5.3.26/Examples/CMakeLists.txt --- old/bcunit-5.2.62/Examples/CMakeLists.txt 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/Examples/CMakeLists.txt 2023-11-23 11:25:00.000000000 +0100 @@ -24,15 +24,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -if(ENABLE_BASIC) +if(ENABLE_BCUNIT_BASIC) add_subdirectory(BasicTest) endif() -if(ENABLE_CONSOLE) +if(ENABLE_BCUNIT_CONSOLE) add_subdirectory(ConsoleTest) endif() -if(ENABLE_CURSES) +if(ENABLE_BCUNIT_CURSES) add_subdirectory(CursesTest) endif() -if(ENABLE_AUTOMATED) +if(ENABLE_BCUNIT_AUTOMATED) add_subdirectory(AutomatedTest) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/build/CMakeLists.txt new/bcunit-5.3.26/build/CMakeLists.txt --- old/bcunit-5.2.62/build/CMakeLists.txt 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/build/CMakeLists.txt 2023-11-23 11:25:00.000000000 +0100 @@ -21,7 +21,8 @@ ############################################################################ if(NOT CPACK_PACKAGE_NAME) - set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") + string(TOLOWER "${PROJECT_NAME}" LOWERCASE_PROJECT_NAME) + set(CPACK_PACKAGE_NAME "${LOWERCASE_PROJECT_NAME}") endif() set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BCUnit unit test framework forked from CUnit by Belledonne Communications projects") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcunit-5.2.62/config.h.cmake new/bcunit-5.3.26/config.h.cmake --- old/bcunit-5.2.62/config.h.cmake 2023-05-22 21:55:12.000000000 +0200 +++ new/bcunit-5.3.26/config.h.cmake 2023-11-23 11:25:00.000000000 +0100 @@ -1,6 +1,6 @@ /*************************************************************************** -* antlr3config.h.cmake -* Copyright (C) 2014 Belledonne Communications, Grenoble France +* config.h.cmake +* Copyright (C) 2014-2023 Belledonne Communications, Grenoble France * **************************************************************************** * @@ -20,11 +20,4 @@ * ****************************************************************************/ -#cmakedefine PACKAGE "@PACKAGE@" -#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@" -#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@" -#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@" -#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@" -#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" -#cmakedefine PACKAGE_URL "@PACKAGE_URL@" #cmakedefine VERSION "@VERSION@" ++++++ bcunit-sover.patch ++++++ --- /var/tmp/diff_new_pack.aHLVXk/_old 2024-03-14 17:46:09.339801135 +0100 +++ /var/tmp/diff_new_pack.aHLVXk/_new 2024-03-14 17:46:09.339801135 +0100 @@ -1,13 +1,21 @@ -Index: bcunit-5.2.62/BCUnit/Sources/CMakeLists.txt +Index: bcunit-5.3.7/BCUnit/Sources/CMakeLists.txt =================================================================== ---- bcunit-5.2.62.orig/BCUnit/Sources/CMakeLists.txt -+++ bcunit-5.2.62/BCUnit/Sources/CMakeLists.txt -@@ -176,6 +176,7 @@ if(ENABLE_STATIC) +--- bcunit-5.3.7.orig/BCUnit/Sources/CMakeLists.txt ++++ bcunit-5.3.7/BCUnit/Sources/CMakeLists.txt +@@ -155,13 +155,14 @@ if(WIN32) endif() - if(ENABLE_SHARED) - add_library(bcunit SHARED ${SOURCE_FILES}) -+ set_target_properties(bcunit PROPERTIES SOVERSION 1) - set_target_properties(bcunit PROPERTIES VERSION 1.0.1) - target_compile_definitions(bcunit INTERFACE "$<BUILD_INTERFACE:IN_BCUNIT_SOURCES>") - target_include_directories(bcunit PUBLIC + + +-add_library(bcunit ${SOURCE_FILES}) ++add_library(bcunit SHARED ${SOURCE_FILES}) + target_include_directories(bcunit PUBLIC + $<INSTALL_INTERFACE:include> + $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/BCUnit/Headers> + $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/BCUnit/Headers> + ) + set_target_properties(bcunit PROPERTIES VERSION 1.0.1) ++set_target_properties(bcunit PROPERTIES SOVERSION 1) + + if(ANDROID) + target_link_libraries(bcunit PUBLIC "log") ++++++ set_current_version.patch ++++++ --- /var/tmp/diff_new_pack.aHLVXk/_old 2024-03-14 17:46:09.375802459 +0100 +++ /var/tmp/diff_new_pack.aHLVXk/_new 2024-03-14 17:46:09.379802607 +0100 @@ -1,16 +1,14 @@ ---- bcunit-5.2.62/CMakeLists.txt.orig 2023-10-06 07:48:53.136339960 +0200 -+++ bcunit-5.2.62/CMakeLists.txt 2023-10-06 07:49:02.626391603 +0200 -@@ -32,9 +32,9 @@ +Index: bcunit-5.3.7/CMakeLists.txt +=================================================================== +--- bcunit-5.3.7.orig/CMakeLists.txt ++++ bcunit-5.3.7/CMakeLists.txt +@@ -22,7 +22,7 @@ + + cmake_minimum_required(VERSION 3.22) + +-project(BCUnit VERSION "3.0.2" LANGUAGES C) ++project(BCUnit VERSION "5.3.26" LANGUAGES C) - set(PACKAGE "BCUnit") - set(PACKAGE_NAME "${PACKAGE}") --set(PROJECT_VERSION_MAJOR 3) --set(PROJECT_VERSION_MINOR 0) --set(PROJECT_VERSION_PATCH 2) -+set(PROJECT_VERSION_MAJOR 5) -+set(PROJECT_VERSION_MINOR 2) -+set(PROJECT_VERSION_PATCH 62) - set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") set(VERSION "${PROJECT_VERSION}") set(RELEASE "${PROJECT_VERSION_PATCH}")
