Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-29 23:29:41 +02:00
Code Issues Releases Wiki Activity

Replace references to topdir and libsrc

Browse Source 
Signed-off-by: Sol Fisher Romanoff <sol@solfisher.com>
This commit is contained in:
Sol Fisher Romanoff 2021-08-07 14:31:15 +03:00
parent 5c8f61af86
commit 8cae1b7cb4
No known key found for this signature in database
GPG Key ID: 0E0ACA5D1C244E1F
9 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -35,10 +35,6 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" )
) )
endif() endif()
# Just a couple of convenience variables
set( topdir "${CMAKE_SOURCE_DIR}" )
set( libsrc "${topdir}/lib-src" )
# Default build type is Debug # Default build type is Debug
if( NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES ) if( NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES )
set( CMAKE_BUILD_TYPE "Debug" ) set( CMAKE_BUILD_TYPE "Debug" )

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

@ -586,7 +586,7 @@ function( addlib dir name symbol required check )
# Define target's name and it's source directory # Define target's name and it's source directory
set( TARGET ${dir} ) set( TARGET ${dir} )
set( TARGET_ROOT ${libsrc}/${dir} ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR}/lib-src/${dir} )
# Define the option name # Define the option name
set( use ${_OPT}use_${name} ) set( use ${_OPT}use_${name} )

4
help/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set( TARGET manual ) set( TARGET manual )
set( TARGET_ROOT ${topdir}/manual ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR}/manual )
message( STATUS "========== Configuring ${TARGET} ==========" ) message( STATUS "========== Configuring ${TARGET} ==========" )
@ -13,7 +13,7 @@ endif()
set( host "alphamanual.audacityteam.org" ) set( host "alphamanual.audacityteam.org" )
set( src "https://${host}/man" ) set( src "https://${host}/man" )
set( dst "${_DEST}/help/manual" ) set( dst "${_DEST}/help/manual" )
set( script_dir "${topdir}/scripts/mw2html_audacity" ) set( script_dir "${CMAKE_SOURCE_DIR}/scripts/mw2html_audacity" )
set( script "mw2html.py" ) set( script "mw2html.py" )
set( out_dir "${_INTDIR}" ) set( out_dir "${_INTDIR}" )
set( out "${out_dir}/${host}/index.html" ) set( out "${out_dir}/${host}/index.html" )

2
images/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set( TARGET images ) set( TARGET images )
set( TARGET_ROOT ${topdir}/images ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR}/images )
message( STATUS "========== Configuring ${TARGET} ==========" ) message( STATUS "========== Configuring ${TARGET} ==========" )

2
locale/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set( TARGET locale ) set( TARGET locale )
set( TARGET_ROOT ${topdir}/locale ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR}/locale )
message( STATUS "========== Configuring ${TARGET} ==========" ) message( STATUS "========== Configuring ${TARGET} ==========" )

4
nyquist/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set( TARGET nyquist ) set( TARGET nyquist )
set( TARGET_ROOT ${topdir}/nyquist ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR}/nyquist )
message( STATUS "========== Configuring ${TARGET} ==========" ) message( STATUS "========== Configuring ${TARGET} ==========" )
@ -61,7 +61,7 @@ foreach( source ${RUNTIME} )
# Fix this when reorganizing the Nyquist sources # Fix this when reorganizing the Nyquist sources
if( source STREQUAL "system.lsp" ) if( source STREQUAL "system.lsp" )
if( CMAKE_SYSTEM_NAME MATCHES "Windows" ) if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
set( src "${libsrc}/libnyquist/nyquist/sys/win/msvc/system.lsp" ) set( src "${CMAKE_SOURCE_DIR}/lib-src/libnyquist/nyquist/sys/win/msvc/system.lsp" )
endif() endif()
endif() endif()

2
plug-ins/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set( TARGET plug-ins ) set( TARGET plug-ins )
set( TARGET_ROOT ${topdir}/plug-ins ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR}/plug-ins )
message( STATUS "========== Configuring ${TARGET} ==========" ) message( STATUS "========== Configuring ${TARGET} ==========" )

2
scripts/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set( TARGET minsrc ) set( TARGET minsrc )
set( TARGET_ROOT ${topdir} ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR} )
message( STATUS "========== Configuring ${TARGET} ==========" ) message( STATUS "========== Configuring ${TARGET} ==========" )

10
src/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set( TARGET Tenacity ) set( TARGET Tenacity )
set( TARGET_ROOT ${topdir}/src ) set( TARGET_ROOT ${CMAKE_SOURCE_DIR}/src )
message( STATUS "========== Configuring ${TARGET} ==========" ) message( STATUS "========== Configuring ${TARGET} ==========" )
@ -25,7 +25,7 @@ if( GIT_FOUND )
-D "_PRVDIR=${_PRVDIR}" -D "_PRVDIR=${_PRVDIR}"
-P "${AUDACITY_MODULE_PATH}/Version.cmake" -P "${AUDACITY_MODULE_PATH}/Version.cmake"
WORKING_DIRECTORY WORKING_DIRECTORY
${topdir} ${CMAKE_SOURCE_DIR}
) )
add_dependencies( ${TARGET} version ) add_dependencies( ${TARGET} version )
@ -1014,7 +1014,7 @@ list( APPEND HEADERS
list( APPEND INCLUDES list( APPEND INCLUDES
PUBLIC PUBLIC
${_PRVDIR} ${_PRVDIR}
${topdir}/include ${CMAKE_SOURCE_DIR}/include
${TARGET_ROOT} ${TARGET_ROOT}
) )
@ -1387,11 +1387,11 @@ else()
FILES_MATCHING PATTERN "*.so*" ) FILES_MATCHING PATTERN "*.so*" )
install( FILES "${_INTDIR}/tenacity.desktop" install( FILES "${_INTDIR}/tenacity.desktop"
DESTINATION "${_DATADIR}/applications" ) DESTINATION "${_DATADIR}/applications" )
install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.md" install( FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" "${CMAKE_SOURCE_DIR}/README.md"
DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}" ) DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}" )
install( FILES "${_SRCDIR}/tenacity.xml" install( FILES "${_SRCDIR}/tenacity.xml"
DESTINATION "${_DATADIR}/mime/packages" ) DESTINATION "${_DATADIR}/mime/packages" )
install( FILES "${topdir}/presets/EQDefaultCurves.xml" install( FILES "${CMAKE_SOURCE_DIR}/presets/EQDefaultCurves.xml"
DESTINATION "${_PKGDATA}" ) DESTINATION "${_PKGDATA}" )
install( PROGRAMS "${PROJECT_SOURCE_DIR}/linux/tenacity.sh" install( PROGRAMS "${PROJECT_SOURCE_DIR}/linux/tenacity.sh"
DESTINATION "." DESTINATION "."