From c886851edc915c5f34df791380b800e9eee83ed0 Mon Sep 17 00:00:00 2001 From: Raphael Graf Date: Tue, 25 Feb 2020 19:42:12 +0100 Subject: [PATCH] Improve CMake BSD compatibility (#433) --- locale/CMakeLists.txt | 8 ++++---- src/CMakeLists.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/CMakeLists.txt b/locale/CMakeLists.txt index 893da3889..617e2ed9b 100755 --- a/locale/CMakeLists.txt +++ b/locale/CMakeLists.txt @@ -132,10 +132,10 @@ endif() if( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) set( locale "${_DEST}/Resources" ) -elseif( CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD" ) - set( locale "${_DEST}/locale" ) elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" ) set( locale "${_DEST}/Languanges" ) +else() + set( locale "${_DEST}/locale" ) endif() set( OUTPUTS ) @@ -144,10 +144,10 @@ foreach( source ${SOURCES} ) if( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) set( dst "${locale}/${lang}.lproj" ) - elseif( CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD" ) - set( dst "${locale}/${lang}/LC_MESSAGES" ) elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" ) set( dst "${locale}/${lang}" ) + else() + set( dst "${locale}/${lang}/LC_MESSAGES" ) endif() set( po "${_SRCDIR}/${source}" ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 095f4bb38..1984bd83f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1084,9 +1084,9 @@ list( APPEND LIBRARIES $<$:soundtouch> $<$:libvamp> # $<$:libvamp-hostsdk> - $<$:PkgConfig::GLIB> - $<$:z> - $<$:pthread> + $<$:PkgConfig::GLIB> + $<$:z> + $<$:pthread> ) # @@ -1273,7 +1273,7 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) set_target_property_all( "Wrapper" RUNTIME_OUTPUT_DIRECTORY "${_EXEDIR}" ) organize_source( "${WRAPPER_ROOT}" "mac" "${WRAPPER_SOURCES}" ) -elseif( CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD" ) +else() set( _EXE "audacity" ) # Create the config file