Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-14 15:29:53 +02:00
Code Issues Releases Wiki Activity

🐛 Fixed missing files when packaging with ninja on windows

Browse Source 
Signed-off-by: Edgar <Edgar@AnotherFoxGuy.com>
This commit is contained in:
Edgar 2021-07-18 17:07:16 +02:00 committed by Be
parent 9285ed97c3
commit 641b293dde
8 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -205,7 +205,7 @@ message( STATUS " Compiler Standard Required: ${CMAKE_CXX_STANDARD_REQUIRED}" )
message( STATUS " Compiler Extensions: ${CMAKE_CXX_EXTENSIONS}" ) message( STATUS " Compiler Extensions: ${CMAKE_CXX_EXTENSIONS}" )
message( STATUS ) message( STATUS )
if( CMAKE_GENERATOR MATCHES "Visual Studio" ) if( MSVC )
message( STATUS " MSVC Version: ${MSVC_VERSION}" ) message( STATUS " MSVC Version: ${MSVC_VERSION}" )
message( STATUS " MSVC Toolset: ${MSVC_TOOLSET_VERSION}" ) message( STATUS " MSVC Toolset: ${MSVC_TOOLSET_VERSION}" )
message( STATUS ) message( STATUS )

2
help/CMakeLists.txt
View File

@ -49,7 +49,7 @@ if( ${_OPT}package_manual )
endif() endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*") if( NOT WIN32)
install( DIRECTORY "${dst}" OPTIONAL install( DIRECTORY "${dst}" OPTIONAL
DESTINATION "${_DATADIR}/audacity/help" ) DESTINATION "${_DATADIR}/audacity/help" )
install( FILES "${_SRCDIR}/audacity.1" install( FILES "${_SRCDIR}/audacity.1"

2
images/CMakeLists.txt
View File

@ -16,7 +16,7 @@ list( APPEND PIXMAPS
) )
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*") if( NOT WIN32)
install( FILES "${_SRCDIR}/audacity.svg" install( FILES "${_SRCDIR}/audacity.svg"
DESTINATION "${_DATADIR}/icons/hicolor/scalable/apps" ) DESTINATION "${_DATADIR}/icons/hicolor/scalable/apps" )
install( DIRECTORY "${_SRCDIR}/icons/" install( DIRECTORY "${_SRCDIR}/icons/"

2
locale/CMakeLists.txt
View File

@ -80,7 +80,7 @@ endforeach()
add_custom_target( "${TARGET}" ALL DEPENDS ${OUTPUTS} SOURCES "${SOURCES}" ) add_custom_target( "${TARGET}" ALL DEPENDS ${OUTPUTS} SOURCES "${SOURCES}" )
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*") if( NOT WIN32)
install( DIRECTORY ${locale}/ install( DIRECTORY ${locale}/
TYPE LOCALE ) TYPE LOCALE )
endif() endif()

2
modules/CMakeLists.txt
View File

@ -17,7 +17,7 @@ foreach( MODULE ${MODULES} )
endforeach() endforeach()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" ) if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*") if( NOT WIN32)
install( DIRECTORY "${_DEST}/modules" install( DIRECTORY "${_DEST}/modules"
DESTINATION "${_PKGLIB}" ) DESTINATION "${_PKGLIB}" )
endif() endif()

2
nyquist/CMakeLists.txt
View File

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

2
plug-ins/CMakeLists.txt
View File

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

11
src/CMakeLists.txt
View File

@ -1362,13 +1362,16 @@ if( "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" )
PATTERN "*.ilk" EXCLUDE PATTERN "*.ilk" EXCLUDE
) )
else() else()
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) if( APPLE )
install( TARGETS ${TARGET} install( TARGETS ${TARGET}
DESTINATION "." DESTINATION "."
RESOURCE DESTINATION "${_APPDIR}/Resources" ) RESOURCE DESTINATION "${_APPDIR}/Resources" )
elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" ) elseif( WIN32 )
install( TARGETS ${TARGET} install( DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
DESTINATION "." ) DESTINATION "."
USE_SOURCE_PERMISSIONS
PATTERN "*.pdb" EXCLUDE
PATTERN "*.ilk" EXCLUDE )
else() else()
install( TARGETS ${TARGET} RUNTIME ) install( TARGETS ${TARGET} RUNTIME )
install( DIRECTORY "${_DEST}/${_LIBDIR}/" install( DIRECTORY "${_DEST}/${_LIBDIR}/"