highperfocused/tenacity
1
0
Fork 0
mirror of https://codeberg.org/tenacityteam/tenacity synced 2025-09-28 01:06:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix install rules

Browse Source 
Fix install rules for packaging on Windows with Ninja.

Signed-off-by: Avery King <gperson@disroot.org>
This commit is contained in:
Avery King
2025-03-21 16:53:28 -07:00
parent 5889d567b2
commit a86036c072
6 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -317,7 +317,9 @@ if( CMAKE_GENERATOR MATCHES "Visual Studio" )
PROPERTIES
VS_STARTUP_PROJECT "${CMAKE_PROJECT_NAME}"
)
endif()
if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
# Build using multiple processors
foreach( config ${CMAKE_CONFIGURATION_TYPES} )
string( TOUPPER "${config}" config )
@@ -330,8 +332,7 @@ if( CMAKE_GENERATOR MATCHES "Visual Studio" )
set( CMAKE_INSTALL_UCRT_LIBRARIES NO )
set( CMAKE_INSTALL_MFC_LIBRARIES NO )
set( CMAKE_INSTALL_OPENMP_LIBRARIES NO )
endif()
if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
include( InstallRequiredSystemLibraries )
endif()

20
help/CMakeLists.txt
View File

@@ -31,20 +31,18 @@ if (PACKAGE_MANUAL)
) \
")
if( "${CMAKE_GENERATOR}" MATCHES "Xcode" )
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
install( DIRECTORY "${MANUAL_PATH}/" DESTINATION "${_APPDIR}/help/manual" )
elseif( "${CMAKE_GENERATOR}" MATCHES "Visual Studio*" )
elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
install( DIRECTORY "${MANUAL_PATH}/" DESTINATION "help/manual" )
endif()
endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
install( DIRECTORY "${MANUAL_PATH}" OPTIONAL
DESTINATION "${_DATADIR}/tenacity/help" )
install( FILES "${_SRCDIR}/tenacity.1"
DESTINATION "${_MANDIR}/man1" )
install( FILES "${_INTDIR}/${APP_NAME}.metainfo.xml"
DESTINATION "${_DATADIR}/metainfo" )
endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
install( DIRECTORY "${MANUAL_PATH}" OPTIONAL
DESTINATION "${_DATADIR}/tenacity/help" )
install( FILES "${_SRCDIR}/tenacity.1"
DESTINATION "${_MANDIR}/man1" )
install( FILES "${_INTDIR}/${APP_NAME}.metainfo.xml"
DESTINATION "${_DATADIR}/metainfo" )
endif()

18
images/CMakeLists.txt
View File

@@ -15,15 +15,13 @@ list( APPEND PIXMAPS
${_SRCDIR}/icons/48x48/${APP_NAME}.xpm
)
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
install( FILES "${_SRCDIR}/${APP_NAME}.svg"
DESTINATION "${_DATADIR}/icons/hicolor/scalable/apps" )
install( DIRECTORY "${_SRCDIR}/icons/"
DESTINATION "${_DATADIR}/icons/hicolor"
FILES_MATCHING PATTERN "*.png" )
install( FILES ${PIXMAPS}
DESTINATION "${_DATADIR}/pixmaps" )
endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
install( FILES "${_SRCDIR}/${APP_NAME}.svg"
DESTINATION "${_DATADIR}/icons/hicolor/scalable/apps" )
install( DIRECTORY "${_SRCDIR}/icons/"
DESTINATION "${_DATADIR}/icons/hicolor"
FILES_MATCHING PATTERN "*.png" )
install( FILES ${PIXMAPS}
DESTINATION "${_DATADIR}/pixmaps" )
endif()

8
nyquist/CMakeLists.txt
View File

@@ -82,10 +82,8 @@ endforeach()
add_custom_target( ${TARGET} ALL DEPENDS ${OUTPUTS} SOURCES ${SOURCES} )
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
install( DIRECTORY "${_DEST}/nyquist"
DESTINATION "${_PKGDATA}" )
endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
install( DIRECTORY "${_DEST}/nyquist"
DESTINATION "${_PKGDATA}" )
endif()

8
plug-ins/CMakeLists.txt
View File

@@ -58,10 +58,8 @@ endforeach()
add_custom_target( ${TARGET} ALL DEPENDS ${OUTPUTS} SOURCES ${SOURCES} )
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
install( DIRECTORY "${_DEST}/${TARGET}"
DESTINATION "${_PKGDATA}" )
endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
install( DIRECTORY "${_DEST}/${TARGET}"
DESTINATION "${_PKGDATA}" )
endif()

2
src/CMakeLists.txt
View File

@@ -1287,7 +1287,7 @@ if( NOT CCACHE_PROGRAM AND NOT SCCACHE_PROGRAM )
endif()
endif()
if( "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" )
if (CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
install(
DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
DESTINATION "."