Browse Source

cryptopp && leveldb are looking for x64 libs

cl-refactor
Marek Kotewicz 10 years ago
parent
commit
e77c9e8c89
  1. 12
      cmake/FindCryptoPP.cmake
  2. 18
      cmake/FindLevelDB.cmake

12
cmake/FindCryptoPP.cmake

@ -53,14 +53,22 @@ FIND_PATH (CRYPTOPP_INCLUDE_DIR
PATH_SUFFIXES include
DOC "CryptoPP include directory")
if (CMAKE_CL_64)
set(CRYPTOPP_NAMES cryptlib_x64 cryptopp_x64)
set(CRYPTOPP_NAMES_DEBUG cryptlibd_x64 cryptoppd_x64)
else ()
set(CRYPTOPP_NAMES cryptlib cryptopp)
set(CRYPTOPP_NAMES_DEBUG cryptlibd cryptoppd)
endif()
FIND_LIBRARY (CRYPTOPP_LIBRARY_DEBUG
NAMES cryptlibd cryptoppd
NAMES ${CRYPTOPP_NAMES_DEBUG}
HINTS ${CRYPTOPP_ROOT_DIR}
PATH_SUFFIXES lib
DOC "CryptoPP debug library")
FIND_LIBRARY (CRYPTOPP_LIBRARY_RELEASE
NAMES cryptlib cryptopp
NAMES ${CRYPTOPP_NAMES}
HINTS ${CRYPTOPP_ROOT_DIR}
PATH_SUFFIXES lib
DOC "CryptoPP release library")

18
cmake/FindLevelDB.cmake

@ -16,9 +16,16 @@ find_path(
DOC "leveldb include dir"
)
# if msvc 64 build
if (CMAKE_CL_64)
set(LEVELDB_NAMES leveldb_x64)
else ()
set(LEVELDB_NAMES leveldb)
endif()
find_library(
LEVELDB_LIBRARY
NAMES leveldb
NAMES ${LEVELDB_NAMES}
DOC "leveldb library"
)
@ -29,9 +36,16 @@ set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARY})
# same naming convention as in qt (appending debug library with d)
# boost is using the same "hack" as us with "optimized" and "debug"
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
if (CMAKE_CL_64)
set(LEVELDB_NAMES_DEBUG leveldbd_x64)
else ()
set(LEVELDB_NAMES_DEBUG leveldbd)
endif()
find_library(
LEVELDB_LIBRARY_DEBUG
NAMES leveldbd
NAMES ${LEVELDB_NAMES_DEBUG}
DOC "leveldb debug library"
)

Loading…
Cancel
Save