CMake and dependencies refactor (#395)

* Refactor dependencies

* Work

* remove libelfin

* work

* Works!

* format

* format CI

* sudo

---------

Co-authored-by: Morten Borup Petersen <[email protected]>

Author: mortbopet

CMakeLists.txt

@@ -71,14 +71,6 @@ qt6_add_resources(FONTS_SRC ${CMAKE_SOURCE_DIR}/resources/fonts/fonts.qrc)
 ## Library setup
 ######################################################################
 
-# Header-only libraries used in the project must be included from top CMakeLists.txt file
-include_directories(${RIPES_LIB} SYSTEM PUBLIC external/VSRTL/external/cereal/include)
-include_directories(${RIPES_LIB} PUBLIC external/VSRTL/external)
-include_directories(SYSTEM external/ELFIO)
-include_directories(SYSTEM external/VSRTL/external/Signals)
-include_directories(external/libelfin_cmake)
-include_directories(external)
-
 option(RIPES_BUILD_VERILATOR_PROCESSORS "Build verilator processors" OFF)
 if(RIPES_BUILD_VERILATOR_PROCESSORS)
     if(NOT DEFINED ENV{VERILATOR_ROOT})

external/CMakeLists.txt

@@ -1,19 +1,36 @@
-cmake_minimum_required(VERSION 3.9)
-
 ######################################################################
 ## External project subdirectories
 ######################################################################
 
+include(FetchContent)
+
 # Fancy tab bar
 add_subdirectory(fancytabbar)
 
 # VSRTL
-add_subdirectory(VSRTL)
 set(VSRTL_BUILD_APP OFF)
 set(VSRTL_BUILD_TESTS OFF)
+add_subdirectory(VSRTL)
+
+# libelfin
+FetchContent_Declare(
+    libelfin
+    SYSTEM
+    GIT_REPOSITORY https://github.com/mortbopet/libelfin.git
+    GIT_TAG        93a424940dc6e721818c5634b1876c8800e3f980
+)
+FetchContent_MakeAvailable(libelfin)
 
-add_subdirectory(libelfin)
 # Make autoMOC and autoUIC happy about the generated libelfin files
 set(libelfin_src "${CMAKE_CURRENT_BINARY_DIR}/libelfin")
 set_property(SOURCE "${libelfin_src}/elf_to_string.cc" PROPERTY SKIP_AUTOGEN ON)
 set_property(SOURCE "${libelfin_src}/dwarf_to_string.cc" PROPERTY SKIP_AUTOGEN ON)
+
+# ELFIO
+FetchContent_Declare(
+    ELFIO
+    SYSTEM
+    GIT_REPOSITORY https://github.com/serge1/ELFIO.git
+    GIT_TAG 79fcd11595d0793dec593e9072e36c7923c57c1a
+)
+FetchContent_MakeAvailable(ELFIO)

external/ELFIO

@@ -8,10 +8,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-file(GLOB LIB_SOURCES *.cpp graphics/*.cpp)
-file(GLOB LIB_HEADERS *.h graphics/*.h)
-file(GLOB LIB_UIS *.ui)
+file(GLOB LIB_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
+file(GLOB LIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/fancytabbar/*.h)
 
-set(FANCYTABBAR_LIB fancytabbar_lib)
-add_library(${FANCYTABBAR_LIB} STATIC ${LIB_SOURCES} ${LIB_HEADERS} ${LIB_UIS})
-target_link_libraries(${FANCYTABBAR_LIB} Qt6::Core Qt6::Widgets)
+add_library(fancytabbar STATIC ${LIB_SOURCES} ${LIB_HEADERS})
+add_library(fancytabbar::fancytabbar ALIAS fancytabbar)
+target_link_libraries(fancytabbar Qt6::Core Qt6::Widgets)
+target_include_directories(fancytabbar PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)

external/VSRTL

@@ -5,7 +5,7 @@
 #include <QVector>
 #include <QWidget>
 
-#include "fancytab.h"
+#include "fancytabbar/fancytab.h"
 
 /*!
  * \brief Goal of this class is TabBar similar to QtCreator left TabBarr.

external/fancytabbar/CMakeLists.txt

@@ -0,0 +1,8 @@
+#include "fancytabbar/fancytab.h"
+
+#include <QDebug>
+
+FancyTab::FancyTab(const QIcon &icon, QString text) {
+  m_icon = icon;
+  m_text = text;
+}

external/fancytabbar/fancytab.cpp

@@ -1,4 +1,4 @@
-#include "fancytabbar.h"
+#include "fancytabbar/fancytabbar.h"
 
 #include <QDebug>
 #include <QLinearGradient>