Skip to content

Commit a5ecde5

Browse files
authored
chore: reorganize repository layout — core, tools, docs, resources; update CMake and tests (#712)
1 parent 613d61a commit a5ecde5

179 files changed

Lines changed: 20 additions & 18 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ configure_file(
3131
)
3232
include_directories(${CMAKE_CURRENT_BINARY_DIR}/version)
3333

34-
# calchart_cmd, Mac, Linux only
34+
# Core library
35+
add_subdirectory(core)
36+
37+
# calchart_cmd, Mac, Linux only (depends on core)
3538
if(NOT MSVC)
36-
add_subdirectory(calchart_cmd)
39+
add_subdirectory(tools/calchart_cmd)
3740
endif()
3841

39-
# CalChart
42+
# CalChart (GUI)
4043
add_subdirectory(src)
4144

4245
# CTests section
@@ -63,12 +66,12 @@ endif()
6366
# information about the DragNDrop installer was from:
6467
# https://blog.kitware.com/creating-mac-os-x-packages-with-cmake/
6568
include(InstallRequiredSystemLibraries)
66-
set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${PROJECT_SOURCE_DIR}/resources-macos/CalChart_CMakeDMGSetup.scpt")
67-
set(CPACK_DMG_BACKGROUND_IMAGE "${PROJECT_SOURCE_DIR}/resources-macos/CalChart_DMGBackground.png")
69+
set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${PROJECT_SOURCE_DIR}/resources/macos/CalChart_CMakeDMGSetup.scpt")
70+
set(CPACK_DMG_BACKGROUND_IMAGE "${PROJECT_SOURCE_DIR}/resources/macos/CalChart_DMGBackground.png")
6871

6972
# information about windows NSIS installer
70-
set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/resources/calchart.ico")
71-
set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/resources/calchart.ico")
73+
set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/resources/common/calchart.ico")
74+
set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/resources/common/calchart.ico")
7275

7376
set(CPACK_PACKAGE_VERSION_MAJOR "${CalChart_VERSION_MAJOR}")
7477
set(CPACK_PACKAGE_VERSION_MINOR "${CalChart_VERSION_MINOR}")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ SetupCompilerForTarget(calchart_core)
9797
target_include_directories(
9898
calchart_core
9999
PRIVATE
100-
${PROJECT_SOURCE_DIR}/src/core
100+
${PROJECT_SOURCE_DIR}/core
101101
INTERFACE
102-
${PROJECT_SOURCE_DIR}/src/core
102+
${PROJECT_SOURCE_DIR}/core
103103
)
104104

105105
target_link_libraries(calchart_core PRIVATE

0 commit comments

Comments
 (0)