Skip to content

Commit 6a5dbcc

Browse files
committed
refactor: streamline installation logic for Windows and remove unnecessary CPACK_IGNORE_FILES
1 parent 3d21a09 commit 6a5dbcc

File tree

2 files changed

+13
-37
lines changed

2 files changed

+13
-37
lines changed

cmake/InstallWindows.cmake

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,18 @@
1-
if(LINUX)
2-
install(FILES "${CMAKE_BINARY_DIR}/manual.html"
3-
DESTINATION "${CMAKE_INSTALL_DATADIR}/retuner")
4-
else()
5-
install(FILES "${CMAKE_BINARY_DIR}/manual.html"
1+
if(PANDOC_EXECUTABLE)
2+
install(FILES "${PROJECT_BINARY_DIR}/manual.html"
63
DESTINATION "${CMAKE_INSTALL_PREFIX}")
74
endif()
85

6+
install(FILES LICENSE.txt DESTINATION "${CMAKE_INSTALL_PREFIX}")
97

10-
if(LINUX)
11-
install(FILES LICENSE.txt DESTINATION "${CMAKE_INSTALL_DATADIR}/retuner")
12-
else()
13-
install(FILES LICENSE.txt DESTINATION "${CMAKE_INSTALL_PREFIX}")
14-
endif()
15-
16-
if(LINUX OR WIN32)
17-
install(TARGETS reTuner_CLAP DESTINATION "${CMAKE_INSTALL_LIBDIR}/clap")
18-
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/reTuner_artefacts/$<CONFIG>/LV2/"
19-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/lv2")
20-
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/reTuner_artefacts/$<CONFIG>/VST3/"
21-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/vst3")
22-
elseif(APPLE)
23-
install(TARGETS "reTuner_AU" LIBRARY DESTINATION "Plug-Ins/AU")
24-
install(TARGETS "reTuner_CLAP" LIBRARY DESTINATION "Plug-Ins/CLAP")
25-
install(TARGETS "reTuner_VST3" LIBRARY DESTINATION "Plug-Ins/VST3")
26-
# LV2 on macOS isn't a real library bundle.
27-
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/reTuner_artefacts/$<CONFIG>/LV2/"
28-
DESTINATION "Plug-Ins/LV2")
29-
endif()
30-
31-
32-
if(NOT APPLE)
33-
install(TARGETS reTunerApp DESTINATION ${CMAKE_INSTALL_BINDIR})
34-
else()
35-
install(TARGETS reTunerApp
36-
BUNDLE DESTINATION "${CMAKE_INSTALL_PREFIX}")
37-
endif()
8+
install(TARGETS reTuner_CLAP DESTINATION "${CMAKE_INSTALL_LIBDIR}/clap")
9+
install(DIRECTORY "${PROJECT_BINARY_DIR}/reTuner_artefacts/$<CONFIG>/LV2/"
10+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/lv2"
11+
PATTERN "*.lib" EXCLUDE
12+
PATTERN "*.exp" EXCLUDE)
13+
install(DIRECTORY "${PROJECT_BINARY_DIR}/reTuner_artefacts/$<CONFIG>/VST3/"
14+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/vst3"
15+
PATTERN "*.lib" EXCLUDE
16+
PATTERN "*.exp" EXCLUDE)
3817

18+
install(TARGETS reTunerApp DESTINATION ${CMAKE_INSTALL_BINDIR})

cmake/Packaging.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ elseif(APPLE)
3535
elseif(WIN32)
3636
set(RETUNER_SYSTEM_NAME "windows")
3737
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" RETUNER_PROCESSOR)
38-
set(CPACK_IGNORE_FILES
39-
"/\\.lib$"
40-
"/\\.exp$"
41-
"/\\.ico$")
4238
set(CPACK_GENERATOR "ZIP")
4339
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
4440
set(CPACK_PACKAGING_INSTALL_PREFIX "/")

0 commit comments

Comments
 (0)