File tree 2 files changed +4
-6
lines changed
2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -128,8 +128,7 @@ if(CMAKE_CONFIGURATION_TYPES)
128
128
endif ()
129
129
130
130
set (GMMLIB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
131
-
132
- if ("${ARCH} " MATCHES "64" )
131
+ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
133
132
set (GMMLIB_ARCH "64" )
134
133
else ()
135
134
set (GMMLIB_ARCH "32" )
@@ -410,7 +409,7 @@ endforeach()
410
409
###################################################################################
411
410
add_library ( ${GMM_LIB_DLL_NAME} SHARED igdgmm.rc ${UMD_SOURCES} ${UMD_HEADERS} )
412
411
413
- set_target_properties (${GMM_LIB_DLL_NAME} PROPERTIES OUTPUT_NAME "igdgmm${ARCH } " )
412
+ set_target_properties (${GMM_LIB_DLL_NAME} PROPERTIES OUTPUT_NAME "igdgmm${GMMLIB_ARCH } " )
414
413
415
414
if (MSVC )
416
415
@@ -519,12 +518,12 @@ bs_set_extra_target_properties(${GMM_LIB_DLL_NAME}
519
518
GMM_LIB_DLL
520
519
)
521
520
522
- if ("${ARCH } " MATCHES "64" )
521
+ if ("${GMMLIB_ARCH } " MATCHES "64" )
523
522
bs_set_extra_target_properties(${GMM_LIB_DLL_NAME}
524
523
_X64)
525
524
endif ()
526
525
527
- if (ARCH EQUAL 32 )
526
+ if (" ${GMMLIB_ARCH} " MATCHES "32" )
528
527
#bs_set_extra_target_properties(igfx_gmmumd_ocl UNUSED_ISTDLIB_MT)
529
528
530
529
if ((CMAKE_BUILD_TYPE STREQUAL "Release" ) OR (CMAKE_BUILD_TYPE STREQUAL "ReleaseInternal" ))
Original file line number Diff line number Diff line change @@ -40,7 +40,6 @@ endif()
40
40
41
41
# Ensure definitions for some variables that should be set by the overall build system.
42
42
bs_set_if_undefined(PLATFORM "linux" )
43
- bs_set_if_undefined(ARCH "64" )
44
43
bs_set_if_undefined(GFXGEN "9" )
45
44
bs_set_if_undefined(CXXFLAGS "-D_GLIBCXX_USE_CXX11_ABI=0" )
46
45
You can’t perform that action at this time.
0 commit comments