Changeset 3224 in CLRX


Ignore:
Timestamp:
Jun 29, 2017, 11:01:06 AM (2 years ago)
Author:
matszpk
Message:

CLRadeonExtender: Add new option GCC5CXX11NEWABI for forcing new GCC5 C++11 new ABI.

Location:
CLRadeonExtender/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • CLRadeonExtender/trunk/CMakeLists.txt

    r3200 r3224  
    2929ENABLE_LANGUAGE(CXX)
    3030
     31OPTION(GCC5CXX11NEWABI "Force new GCC 5 C++11 ABI" OFF)
     32IF(GCC5CXX11NEWABI)
     33    SET(EXTRA_PACK_SUFFIX "-gcc5")
     34ENDIF(GCC5CXX11NEWABI)
     35
    3136#####
    3237# packacing
     
    4045SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
    4146IF((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_CL_64) AND NOT BUILD_32BIT)
    42 SET(CPACK_PACKAGE_FILE_NAME CLRadeonExtender-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}-x64)
     47SET(CPACK_PACKAGE_FILE_NAME CLRadeonExtender-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}-x64${EXTRA_PACK_SUFFIX})
    4348ELSE((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_CL_64) AND NOT BUILD_32BIT)
    44 SET(CPACK_PACKAGE_FILE_NAME CLRadeonExtender-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}-x86)
     49SET(CPACK_PACKAGE_FILE_NAME CLRadeonExtender-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}-x86${EXTRA_PACK_SUFFIX})
    4550ENDIF((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_CL_64) AND NOT BUILD_32BIT)
    4651
     
    7378
    7479MESSAGE(STATUS "Use standard ${CPP_STANDARD} for ${CMAKE_CXX_COMPILER}")
     80
     81IF(GCC5CXX11NEWABI)
     82    ADD_DEFINITIONS(-DGLIBCXX_USE_CXX11_ABI=1)
     83ENDIF(GCC5CXX11NEWABI)
    7584
    7685### 32-bit compilation option
  • CLRadeonExtender/trunk/README

    r3223 r3224  
    37376. Usage of libraries in binaries
    3838
    39 The default binary libraries for Linux are compiled for C++11 old ABI, hence you must add
    40 option -D_GLIBCXX_USE_CXX11_ABI=0 to compiler commands if you are using GCC 5.0
    41 or higher or compiler that by default uses new C++11 ABI.
     39The default (without '-gcc5' in name) binary libraries for Linux are compiled
     40for C++11 old ABI, hence you must add option -D_GLIBCXX_USE_CXX11_ABI=0 to
     41compiler commands if you are using GCC 5.0 or higher or compiler that by default
     42uses new C++11 ABI.
    4243
    4344
    4445
    4546
     47
  • CLRadeonExtender/trunk/README.md

    r3223 r3224  
    102102### Usage of libraries in binaries
    103103
    104 The default binary libraries for Linux are compiled for C++11 old ABI, hence you must add
    105 option -D_GLIBCXX_USE_CXX11_ABI=0 to compiler commands if you are using GCC 5.0
    106 or higher or compiler that by default uses new C++11 ABI.
     104The default (without '-gcc5' in name) binary libraries for Linux are compiled
     105for C++11 old ABI, hence you must add option -D_GLIBCXX_USE_CXX11_ABI=0 to
     106compiler commands if you are using GCC 5.0 or higher or compiler that by default
     107uses new C++11 ABI.
    107108
    108109### Usage
Note: See TracChangeset for help on using the changeset viewer.