From dfa74056f5296545569627bc22032dcb0c6c087c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Wed, 2 Jul 2025 00:38:47 +0200 Subject: [PATCH] Fix conan debug build --- CMakeLists.txt | 15 ++++++--------- CONAN_README.md | 1 - Makefile | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0699ff5..23c55c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,6 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -fno-elide-constructors") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast") if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-default-inline") @@ -68,18 +67,19 @@ target_link_libraries(bayesnet # ------- if (CMAKE_BUILD_TYPE STREQUAL "Debug") MESSAGE("Debug mode") - set(ENABLE_TESTING ON) - set(CODE_COVERAGE ON) +else(CMAKE_BUILD_TYPE STREQUAL "Debug") + MESSAGE("Release mode") endif (CMAKE_BUILD_TYPE STREQUAL "Debug") if (ENABLE_TESTING) MESSAGE(STATUS "Testing enabled") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -fno-elide-constructors") find_package(Catch2 CONFIG REQUIRED) find_package(arff-files CONFIG REQUIRED) enable_testing() include(CTest) add_subdirectory(tests) else(ENABLE_TESTING) - message("Release mode") + endif (ENABLE_TESTING) # Installation @@ -99,17 +99,14 @@ configure_package_config_file( install(TARGETS bayesnet EXPORT bayesnetTargets ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - CONFIGURATIONS Release) + LIBRARY DESTINATION lib) install(DIRECTORY bayesnet/ DESTINATION include/bayesnet FILES_MATCHING - CONFIGURATIONS Release PATTERN "*.h") install(FILES ${CMAKE_BINARY_DIR}/configured_files/include/bayesnet/config.h - DESTINATION include/bayesnet - CONFIGURATIONS Release) + DESTINATION include/bayesnet) install(EXPORT bayesnetTargets FILE bayesnetTargets.cmake diff --git a/CONAN_README.md b/CONAN_README.md index fdfe193..a8d3fa5 100644 --- a/CONAN_README.md +++ b/CONAN_README.md @@ -24,7 +24,6 @@ conan profile new default --detect [generators] CMakeDeps CMakeToolchain - ``` 1. Install dependencies: diff --git a/Makefile b/Makefile index 72d140a..eb7d057 100644 --- a/Makefile +++ b/Makefile @@ -220,8 +220,8 @@ release: ## Build release version using Conan conan-create: ## Create Conan package @echo ">>> Creating Conan package..." - @conan create . --build=missing -tf "" --profile=release -tf "" - @conan create . --build=missing -tf "" --profile=debug + @conan create . --build=missing -tf "" --profile=release + @conan create . --build=missing -tf "" --profile=debug -o "&:enable_coverage=False" -o "&:enable_testing=False" @echo ">>> Done" profile ?= release