Skip to content

Commit c4630fe

Browse files
authored
Cleaning up build dirs. Let's move things that are resources into resources. (#368)
1 parent 252acac commit c4630fe

File tree

13 files changed

+4
-3221
lines changed

13 files changed

+4
-3221
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ if (APPLE)
355355

356356
set_target_properties (
357357
CalChart PROPERTIES
358-
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/build-macos/CalChart-Info.plist.in"
358+
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources-macos/CalChart-Info.plist.in"
359359
MACOSX_BUNDLE_ICON_FILE calchart.icns
360360
MACOSX_BUNDLE TRUE
361361
MACOSX_FRAMEWORK_IDENTIFIER com.calband.CalChart
@@ -387,7 +387,7 @@ add_custom_command (
387387
"${CMAKE_CURRENT_SOURCE_DIR}/docs" $<TARGET_FILE_DIR:CalChart>/docs
388388
)
389389

390-
target_sources(CalChart PRIVATE build-windows/WindowsHiDPI.manifest)
390+
target_sources(CalChart PRIVATE resources-windows/WindowsHiDPI.manifest)
391391

392392
endif ()
393393

@@ -418,8 +418,8 @@ if (MSVC)
418418
else ()
419419
set (CPACK_COMPONENTS_ALL applications)
420420
endif ()
421-
set (CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/build-macos/CalChart_CMakeDMGSetup.scpt")
422-
set (CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/build-macos/CalChart_DMGBackground.png")
421+
set (CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/resources-macos/CalChart_CMakeDMGSetup.scpt")
422+
set (CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/resources-macos/CalChart_DMGBackground.png")
423423

424424
set (CPACK_PACKAGE_VERSION_MAJOR "${CalChart_VERSION_MAJOR}")
425425
set (CPACK_PACKAGE_VERSION_MINOR "${CalChart_VERSION_MINOR}")

0 commit comments

Comments
 (0)