From f8c279e6db48d71fe9f381ebd942fb9105764647 Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougue.pro>
Date: Fri, 6 Nov 2015 13:43:56 +0100
Subject: [PATCH] benchmarks: correctly handle 32/64b architecture in assimp
 and opencascade

---
 benchmarks/benchmark_assimp/CMakeLists.txt      |  4 ++--
 benchmarks/benchmark_opencascade/CMakeLists.txt | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/benchmarks/benchmark_assimp/CMakeLists.txt b/benchmarks/benchmark_assimp/CMakeLists.txt
index d76b16b..ab687a8 100644
--- a/benchmarks/benchmark_assimp/CMakeLists.txt
+++ b/benchmarks/benchmark_assimp/CMakeLists.txt
@@ -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})
diff --git a/benchmarks/benchmark_opencascade/CMakeLists.txt b/benchmarks/benchmark_opencascade/CMakeLists.txt
index ec38bd0..65c3a41 100644
--- a/benchmarks/benchmark_opencascade/CMakeLists.txt
+++ b/benchmarks/benchmark_opencascade/CMakeLists.txt
@@ -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})