Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 17:09:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ninja-fix' to 'master'

Browse Source
This commit is contained in:
Semisol 2021-07-11 18:29:25 +03:00
commit fa07a375d2
No known key found for this signature in database
GPG Key ID: 2A5815003B461344
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -257,18 +257,17 @@ if( CMAKE_GENERATOR MATCHES "Visual Studio" )
include( InstallRequiredSystemLibraries ) include( InstallRequiredSystemLibraries )
endif() endif()
# Where the final product is stored
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
set ( _SHARED_PROXY_BASE "shared" ) set ( _SHARED_PROXY_BASE "shared" )
set ( _SHARED_PROXY_BASE_PATH "${CMAKE_BINARY_DIR}/${_SHARED_PROXY_BASE}") set ( _SHARED_PROXY_BASE_PATH "${CMAKE_BINARY_DIR}/${_SHARED_PROXY_BASE}")
# Define the non-install and executable paths # Define the non-install and executable paths and where the final product is stored
if( CMAKE_CONFIGURATION_TYPES ) if( CMAKE_CONFIGURATION_TYPES )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}" ) set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}" )
set( _SHARED_PROXY_PATH "${_SHARED_PROXY_BASE_PATH}/${CMAKE_CFG_INTDIR}") set( _SHARED_PROXY_PATH "${_SHARED_PROXY_BASE_PATH}/${CMAKE_CFG_INTDIR}")
else() else()
set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}" ) set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE} )
set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/" )
set( _SHARED_PROXY_PATH "${_SHARED_PROXY_BASE_PATH}/${CMAKE_BUILD_TYPE}") set( _SHARED_PROXY_PATH "${_SHARED_PROXY_BASE_PATH}/${CMAKE_BUILD_TYPE}")
endif() endif()

2
cmake-proxies/cmake-modules/AudacityDependencies.cmake
View File

@ -246,7 +246,7 @@ macro( resolve_conan_dependencies )
OPTIONS ${CONAN_PACKAGE_OPTIONS} OPTIONS ${CONAN_PACKAGE_OPTIONS}
") ")
if(MSVC OR XCODE) if(MSVC OR XCODE AND NOT DEFINED CMAKE_BUILD_TYPE)
foreach(TYPE ${CMAKE_CONFIGURATION_TYPES}) foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
_conan_install(${TYPE}) _conan_install(${TYPE})
endforeach() endforeach()

17
src/CMakeLists.txt
View File

@ -1137,13 +1137,16 @@ if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
) )
# Copy the VC runtime libraries as well # Copy the VC runtime libraries as well
add_custom_command( if(NOT "_X${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}" STREQUAL "_X")
TARGET add_custom_command(
${TARGET} TARGET
COMMAND ${TARGET}
${CMAKE_COMMAND} -E copy ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${_DEST} COMMAND
POST_BUILD ${CMAKE_COMMAND} -E copy ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${_DEST}
) POST_BUILD
)
endif()
elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
# Bug 2400 workaround # Bug 2400 workaround
# #