refactor: move src/core to src/ff7tk

sithlord48 · Aug 28, 2024 · 33986af · 33986af
1 parent 287b589
commit 33986af
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git a/cmake/ff7tkMacros.cmake b/cmake/ff7tkMacros.cmake
@@ -261,7 +261,7 @@ endmacro()
 macro (MAKE_TEST NAME FILE)
     get_filename_component(curDir ${CMAKE_CURRENT_SOURCE_DIR} NAME)
     set(DEP_LIB ff7tk)
-    if( NOT ${curDir} MATCHES core)
+    if( NOT ${curDir} MATCHES ${CMAKE_PROJECT_NAME})
         string(SUBSTRING ${curDir} 0 1 FIRST_LETTER)
         string(TOUPPER ${FIRST_LETTER} FIRST_LETTER)
         string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" curDir_UPPER "${curDir}")

diff --git a/demos/ff7tkQmlGallery/CMakeLists.txt b/demos/ff7tkQmlGallery/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
 )
 set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/imports CACHE STRING "" FORCE)
 
-find_library(ff7tk ${CMAKE_BINARY_DIR}/src/core)
+find_library(ff7tk ${CMAKE_BINARY_DIR}/src/ff7tk)
 find_library(ff7tkData ${CMAKE_BINARY_DIR}/src/data)
 find_library(ff7tkFormats ${CMAKE_BINARY_DIR}/src/formats)
 find_library(ff7tkQuickControls ${CMAKE_BINARY_DIR}/src/quick/data)

diff --git a/demos/ff7tkWidgetGallery/CMakeLists.txt b/demos/ff7tkWidgetGallery/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
         Quick
 )
 
-find_library(ff7tk ${CMAKE_BINARY_DIR}/src/core)
+find_library(ff7tk ${CMAKE_BINARY_DIR}/src/ff7tk)
 find_library(ff7tkData ${CMAKE_BINARY_DIR}/src/data)
 find_library(ff7tkFormats ${CMAKE_BINARY_DIR}/src/formats)
 find_library(ff7tkUtils ${CMAKE_BINARY_DIR}/src/utils)

diff --git a/docs/build.md b/docs/build.md
@@ -12,7 +12,7 @@ To build ff7tk you will a minimum of:
 
 
 A Default Build of ff7tk will build: 
-     - A Required Core Library (libff7tk.so, libff7tk.dylib, or ff7tk.dll)
+     - A Required ff7tk Library (libff7tk.so, libff7tk.dylib, or ff7tk.dll)
      - All Additional Libraries ff7tkQtWidgets, ff7tkWidgets, ff7tkUtils and ff7tkFormats.
      - Headers for the libraries so you can link to them
      - Required CMake parts to find it post install.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -13,7 +13,8 @@ else()
     set(BUILD_FRAMEWORKS FALSE)
 endif()
 
-add_subdirectory(core)
+add_subdirectory(ff7tk)
+
 if(DATA)
     add_subdirectory(data)
 endif()

diff --git a/src/core/CMakeLists.txt → src/ff7tk/CMakeLists.txt b/src/core/CMakeLists.txt → src/ff7tk/CMakeLists.txt
diff --git a/src/core/ff7tkConfig.cmake.in → src/ff7tk/ff7tkConfig.cmake.in b/src/core/ff7tkConfig.cmake.in → src/ff7tk/ff7tkConfig.cmake.in
diff --git a/src/core/ff7tkInfo.h.in → src/ff7tk/ff7tkInfo.h.in b/src/core/ff7tkInfo.h.in → src/ff7tk/ff7tkInfo.h.in