Skip to content

Commit

Permalink
Merge pull request #90 from UmbrellaLeaf5/delete_ice_cream
Browse files Browse the repository at this point in the history
delete icecream-cpp
  • Loading branch information
Stargazer2005 authored Oct 24, 2024
2 parents afd20bf + 096f24d commit 57bf02f
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 41 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 0 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion cmake_paths.cmake
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
18 changes: 0 additions & 18 deletions cmake_scripts/scripts_for_icecream_cpp.cmake

This file was deleted.

1 change: 0 additions & 1 deletion icecream-cpp
Submodule icecream-cpp deleted from 31ca6d
3 changes: 0 additions & 3 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
3 changes: 0 additions & 3 deletions main/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 0 additions & 3 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 57bf02f

Please sign in to comment.