Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-11 09:03:36 +02:00
Code Issues Releases Wiki Activity

Changes to detect 64-bit builds correctly

Browse Source
This commit is contained in:
Leland Lucius
2020-02-12 13:08:41 -06:00
parent 85219e371c
commit db70394964
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@@ -35,13 +35,6 @@ if( WIN32 )
set( GETTEXT_VERSION "0.20.1.1" )
set( PYTHON_NAME "python2" )
set( PYTHON_VERSION "2.7.17" )
# Force the build to 32-bit, unless the user specifically specified
# something else.
if( NOT CMAKE_GENERATOR_PLATFORM )
message( STATUS "Defaulting to 32-bit build..." )
set( CMAKE_GENERATOR_PLATFORM Win32 )
endif()
elseif( APPLE )
# Define the OSX compatibility parameters
set( CMAKE_OSX_ARCHITECTURES x86_64 CACHE INTERNAL "" )
@@ -258,6 +251,19 @@ check_type_size( "size_t" SIZEOF_SIZE LANGUAGE C )
check_type_size( "wchar_t" SIZEOF_WCHAR LANGUAGE C )
check_type_size( "void*" SIZEOF_POINTER LANGUAGE C )
# Determine 32-bit or 64-bit target
if( CMAKE_C_COMPILER_ID MATCHES "MSVC" AND CMAKE_VS_PLATFORM_NAME MATCHES "Win64|x64" )
set( IS_64BIT ON )
elseif( NOT CMAKE_SIZEOF_VOID_P STREQUAL "4" )
set( IS_64BIT ON )
endif()
if( IS_64BIT )
message( STATUS "Building for 64-bit target" )
else()
message( STATUS "Building for 32-bit target" )
endif()
# We'll be using it if it's available
find_package( PkgConfig QUIET )