Merge branch 'master' of matchgit:match065/grive

Conflicts:
	libgrive/src/drive/Drive.cc
pull/40/head
Matchman Green 2012-05-09 22:31:37 +08:00
commit b8153d05f9
1 changed files with 1 additions and 1 deletions

View File

@ -59,7 +59,7 @@ set_target_properties(grive PROPERTIES
set ( LIBGRIVE_INSTALL_DIR lib)
if (EXISTS "${CMAKE_INSTALL_PREFIX}/lib32/" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set (LIBGRIVE_INSTALL_DIR lib32)
else if (EXISTS "${CMAKE_INSTALL_PREFIX}/lib64/" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
elsif (EXISTS "${CMAKE_INSTALL_PREFIX}/lib64/" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set (LIBGRIVE_INSTALL_DIR lib64)
endif ()