caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

benchmarks: correctly handle 32/64b architecture in assimp and opencascade

Browse Source
This commit is contained in:
Hugues Delorme 2015-11-06 13:43:56 +01:00
parent b356ced118
commit f8c279e6db
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/benchmark_assimp/CMakeLists.txt
View File

@ -19,9 +19,9 @@ set(ROOTDIR_ASSIMP ${CMAKE_SOURCE_DIR} CACHE PATH
include_directories(${ROOTDIR_ASSIMP}/include)
add_executable(benchmark_assimp main.cpp ${COMMONS_FILES})
# TODO: choose lib32/lib64 depending on the architecture
# Choose lib32/lib64 depending on the architecture
find_library(
LIB_ASSIMP assimp ${ROOTDIR_ASSIMP}/lib64
LIB_ASSIMP assimp ${ROOTDIR_ASSIMP}/lib${GMIO_TARGET_ARCH_BIT_SIZE}
DOC "Path to the assimp import library")
target_link_libraries(benchmark_assimp ${LIB_ASSIMP})

11
benchmarks/benchmark_opencascade/CMakeLists.txt
View File

@ -41,8 +41,9 @@ add_executable(
${CMAKE_SOURCE_DIR}/src/gmio_support/stl_occ.cpp
${COMMONS_FILES})
# TODO: define only if target arch is 64b
add_definitions(-D_OCC64)
if(GMIO_TARGET_ARCH_BIT_SIZE EQUAL 64)
add_definitions(-D_OCC64)
endif()
if(WIN32)
add_definitions(-DWNT)
@ -61,11 +62,9 @@ include_directories(${ROOTDIR_OPENCASCADE}/inc)
if(MSVC)
set(_MSVC_VERNUM_ 0) # Init
get_msvc_vernum(_MSVC_VERNUM_)
# TODO: choose win32/win64 depending on the architecture
set(LIBDIR_OPENCASCADE ${ROOTDIR_OPENCASCADE}/win64/vc${_MSVC_VERNUM_}/lib)
set(LIBDIR_OPENCASCADE ${ROOTDIR_OPENCASCADE}/win${GMIO_TARGET_ARCH_BIT_SIZE}/vc${_MSVC_VERNUM_}/lib)
elseif((${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND CMAKE_COMPILER_IS_GNUCXX)
# TODO: choose lin32/lin64 depending on the architecture
set(LIBDIR_OPENCASCADE ${ROOTDIR_OPENCASCADE}/lin64/gcc/lib)
set(LIBDIR_OPENCASCADE ${ROOTDIR_OPENCASCADE}/lin${GMIO_TARGET_ARCH_BIT_SIZE}/gcc/lib)
endif()
#message(STATUS ${ROOTDIR_OPENCASCADE})