From 9464b0e7bded58773b1e6e09a680bad12ef36062 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 11 Jun 2010 13:09:52 +0000 Subject: [PATCH] cmake on 64 bits --- adm_local/cmake_files/FindBLSURF.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/adm_local/cmake_files/FindBLSURF.cmake b/adm_local/cmake_files/FindBLSURF.cmake index 118d474..6e103a7 100644 --- a/adm_local/cmake_files/FindBLSURF.cmake +++ b/adm_local/cmake_files/FindBLSURF.cmake @@ -22,8 +22,20 @@ FIND_PATH(BLSURF_INCLUDES_DIR distene/blsurf.h ${BLSURFHOME}/include) SET(BLSURF_INCLUDES) SET(BLSURF_INCLUDES ${BLSURF_INCLUDES} -I${BLSURF_INCLUDES_DIR}) -FIND_LIBRARY(BLSurf BLSurf PATHS ${BLSURFHOME}/lib ${BLSURFHOME}/lib/WinXP_VC9) -FIND_LIBRARY(distene distene PATHS ${BLSURFHOME}/lib ${BLSURFHOME}/lib/WinXP_VC9) +SET(BLSURF_LIBS_PATHS) +SET(BLSURF_LIBS_PATHS ${BLSURF_LIBS_PATHS} ${BLSURFHOME}/lib) +IF(WINDOWS) + SET(BLSURF_LIBS_PATHS ${BLSURF_LIBS_PATHS} ${BLSURFHOME}/lib/WinXP_VC9) +ELSE(WINDOWS) + IF(CMAKE_SIZEOF_VOID_P STREQUAL 8) + SET(BLSURF_LIBS_PATHS ${BLSURF_LIBS_PATHS} ${BLSURFHOME}/lib/Linux_64) + ELSE() + SET(BLSURF_LIBS_PATHS ${BLSURF_LIBS_PATHS} ${BLSURFHOME}/lib/Linux) + ENDIF() +ENDIF(WINDOWS) + +FIND_LIBRARY(BLSurf BLSurf PATHS ${BLSURF_LIBS_PATHS}) +FIND_LIBRARY(distene distene PATHS ${BLSURF_LIBS_PATHS}) SET(BLSURF_LIBS) SET(BLSURF_LIBS ${BLSURF_LIBS} ${BLSurf}) -- 2.39.2