Media
/
gmmlib
mirror of https://github.com/intel/gmmlib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove ARCH and detect architecture from compiler 

Issue#17

Change-Id: I86331d399157015dd746dad5c9d66716629613cd
This commit is contained in:
drprajap 2018-06-21 15:23:56 -07:00 committed by Prajapati, Dimpalben R
parent e6c8949164
commit 72c92c0dfa
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/GmmLib/CMakeLists.txt
View File

@ -128,8 +128,7 @@ if(CMAKE_CONFIGURATION_TYPES)
endif()
set(GMMLIB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
if ("${ARCH}" MATCHES "64")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set (GMMLIB_ARCH "64")
else()
set (GMMLIB_ARCH "32")
@ -410,7 +409,7 @@ endforeach()
###################################################################################
add_library( ${GMM_LIB_DLL_NAME} SHARED igdgmm.rc ${UMD_SOURCES} ${UMD_HEADERS})
set_target_properties(${GMM_LIB_DLL_NAME} PROPERTIES OUTPUT_NAME "igdgmm${ARCH}")
set_target_properties(${GMM_LIB_DLL_NAME} PROPERTIES OUTPUT_NAME "igdgmm${GMMLIB_ARCH}")
if(MSVC)
@ -519,12 +518,12 @@ bs_set_extra_target_properties(${GMM_LIB_DLL_NAME}
GMM_LIB_DLL
)
if("${ARCH}" MATCHES "64")
if("${GMMLIB_ARCH}" MATCHES "64")
bs_set_extra_target_properties(${GMM_LIB_DLL_NAME}
_X64)
endif()
if(ARCH EQUAL 32)
if("${GMMLIB_ARCH}" MATCHES "32")
#bs_set_extra_target_properties(igfx_gmmumd_ocl UNUSED_ISTDLIB_MT)
if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "ReleaseInternal"))

1
Tools/bldsys/bs_init.cmake
View File

@ -40,7 +40,6 @@ endif()
# Ensure definitions for some variables that should be set by the overall build system.
bs_set_if_undefined(PLATFORM "linux")
bs_set_if_undefined(ARCH "64")
bs_set_if_undefined(GFXGEN "9")
bs_set_if_undefined(CXXFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0")