From 096f24dafbe2b688f9f2ca8bab7eaed609365b34 Mon Sep 17 00:00:00 2001 From: Dmitry Krivoruchko <144147209+UmbrellaLeaf5@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:06:27 +0300 Subject: [PATCH] delete icecream-cpp --- .gitmodules | 3 --- CMakeLists.txt | 9 --------- cmake_paths.cmake | 1 - cmake_scripts/scripts_for_icecream_cpp.cmake | 18 ------------------ icecream-cpp | 1 - lib/CMakeLists.txt | 3 --- main/CMakeLists.txt | 3 --- tests/CMakeLists.txt | 3 --- 8 files changed, 41 deletions(-) delete mode 100644 cmake_scripts/scripts_for_icecream_cpp.cmake delete mode 160000 icecream-cpp diff --git a/.gitmodules b/.gitmodules index a915d31..4dd69bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "icecream-cpp"] - path = icecream-cpp - url = https://github.com/renatoGarcia/icecream-cpp [submodule "qcustomplot"] path = qcustomplot url = https://github.com/UmbrellaLeaf5/qcustomplot diff --git a/CMakeLists.txt b/CMakeLists.txt index efc8f82..ac867e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,15 +37,6 @@ find_package(Boost REQUIRED COMPONENTS locale unit_test_framework) # --------------------------------- Submodules folders --------------------------------- # --------------------------------- (and sripts) --------------------------------- -# because of icecream-cpp CMake settings we need to move one file to bin dir -include(${CMAKESCRIPTS_DIR}/scripts_for_icecream_cpp.cmake) -move_icecream_hpp_to_build_dir(${CMAKE_CURRENT_SOURCE_DIR}) - -# and add it to CMAKE_PREFIX_PATH manually -list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/icecream-cpp") -add_subdirectory(${ICECREAM-CPP_DIR}) # here adding icecream-cpp subfolder -find_package(IcecreamCpp) # here finding icecream-cpp - # the command QCUSTOMPLOT_USE_LIBRARY does not work for an unknown reason include(${CMAKESCRIPTS_DIR}/scripts_for_qcustomplot.cmake) load_qcustomplot_dll(${CMAKE_CURRENT_SOURCE_DIR}) # copy one dll file diff --git a/cmake_paths.cmake b/cmake_paths.cmake index b6b8019..207f179 100644 --- a/cmake_paths.cmake +++ b/cmake_paths.cmake @@ -1,7 +1,6 @@ # language: CMake cmake_path(SET QCUSTOMPLOT_DIR "${CMAKE_SOURCE_DIR}/qcustomplot") -cmake_path(SET ICECREAM-CPP_DIR "${CMAKE_SOURCE_DIR}/icecream-cpp") cmake_path(SET CMAKESCRIPTS_DIR "${CMAKE_SOURCE_DIR}/cmake_scripts") cmake_path(SET IMAGES_DIR "${CMAKE_SOURCE_DIR}/.extra/images") diff --git a/cmake_scripts/scripts_for_icecream_cpp.cmake b/cmake_scripts/scripts_for_icecream_cpp.cmake deleted file mode 100644 index 1fb8fc3..0000000 --- a/cmake_scripts/scripts_for_icecream_cpp.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# language: CMake - -function(move_icecream_hpp_to_build_dir START_DIR) - if(EXISTS "${START_DIR}/icecream-cpp") - message(STATUS "Found " ${START_DIR}/icecream-cpp", copying icecream.hpp to build") - - # add needed files to ICLUDEHEADERFILES - file(GLOB ICLUDEHEADERFILES "${START_DIR}/icecream-cpp/*.hpp" "${START_DIR}/icecream-cpp/*.h") - - # copy from ICLUDEHEADERFILES to include dir in binary - foreach(file ${ICLUDEHEADERFILES}) - file(COPY ${file} DESTINATION "${CMAKE_BINARY_DIR}/include") - endforeach() - return() - else() - message(FATAL_ERROR "${START_DIR}/icecream-cpp does not exist, please install submodule 'https://github.com/renatoGarcia/icecream-cpp'") - endif() -endfunction() \ No newline at end of file diff --git a/icecream-cpp b/icecream-cpp deleted file mode 160000 index 31ca6d8..0000000 --- a/icecream-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 31ca6d826e924208853c09ff244d7073d45835b8 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 7920cb7..93e84c1 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -16,6 +16,3 @@ add_library(lib STATIC ${LIB_SOURCES}) # ----------------------------- Include other libraries ----------------------------- # Qt libs: target_link_libraries(lib PRIVATE Qt${QT_VERSION_MAJOR}::Core) - -# IceCreamCpp lib: -include_directories(${IcecreamCpp_INCLUDE_DIRS}) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 2fc0481..7aac6cf 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -28,9 +28,6 @@ target_link_libraries(main PRIVATE target_compile_definitions(main PRIVATE QCUSTOMPLOT_USE_LIBRARY) target_link_libraries(main PUBLIC qcustomplot) -# IceCreamCpp lib: -include_directories(${IcecreamCpp_INCLUDE_DIRS}) - # Our lib: target_link_libraries(main PRIVATE lib) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6f49260..e2d0ee6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -35,9 +35,6 @@ target_link_libraries(tests PRIVATE ${Boost_LIBRARIES}) target_compile_definitions(tests PRIVATE QCUSTOMPLOT_USE_LIBRARY) target_link_libraries(tests PUBLIC qcustomplot) -# IceCreamCpp lib: -include_directories(${IcecreamCpp_INCLUDE_DIRS}) - # Our lib: target_link_libraries(tests PRIVATE lib)