Updating cmake so it exit if libraries are missing. Adding FindBoost and upating FindCryptoPP.

build/CMakeLists.txt

@@ -1,11 +1,12 @@
-
 cmake_minimum_required ( VERSION 2.8 )
-
 project ( i2pd )
 
+
+
 set ( SRC_DIR ".." )
 set ( INC_DIR ".." )
 
+
 add_definitions ( "-std=c++0x -Wall" )
 
 set ( SOURCES
@@ -70,10 +71,35 @@ find_package ( Threads REQUIRED )
 
 find_package ( Boost COMPONENTS system filesystem regex program_options REQUIRED )
 
+find_package(Crypto++ QUIET)
+
+# Check for libraries
+if(!Boost_FOUND)
+    message(FATAL_ERROR "Boost is not found, or your boost version was bellow 1.46. Please download Boost!")
+    return()
+else()
+    # Adding boost directories
+    INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${Boost_INCLUDE_DIRS})
+    LINK_DIRECTORIES(${LINK_DIRECTORIES} ${Boost_LIBRARY_DIRS})
+endif()
+
+if(!CRYPTO++_FOUND)
+    message(FATAL_ERROR "Could not find Crypto++. Please download and install it first!")
+    return()
+else()
+    # Adding Crypto++ directories
+    INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${CRYPTO++_INCLUDE_DIR})
+    LINK_DIRECTORIES(${LINK_DIRECTORIES} ${CRYPTO++_LIBRARIES})
+endif()
+
+
+# End checks
+
+
 set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
 find_package ( CryptoPP REQUIRED )
 
-include_directories ( ${Boost_INCLUDE_DIRS} ${CryptoPP_INCLUDE_DIRS})
+include_directories ( ${Boost_INCLUDE_DIRS} ${CRYPTO++_INCLUDE_DIR})
 
 
 unset ( TMP )
@@ -91,4 +117,4 @@ set ( HEADERS ${TMP} )
 
 add_executable ( ${PROJECT_NAME} WIN32 ${HEADERS} ${SOURCES} )
 
-target_link_libraries( ${PROJECT_NAME} ${Boost_LIBRARIES} ${CryptoPP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
+target_link_libraries( ${PROJECT_NAME} ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )

build/cmake_modules/FindCryptoPP.cmake

@@ -1,28 +1,35 @@
-# Find Crypto++ library
-#
-# Output variables :
-#       CryptoPP_FOUND
-#       CryptoPP_INCLUDE_DIRS
-#       CryptoPP_LIBRARIES
-#
-
-
-FIND_PATH( CryptoPP_INCLUDE_DIR cryptopp/dsa.h )
-
-FIND_LIBRARY( CryptoPP_LIBRARY NAMES cryptopp )
-
-# handle the QUIETLY and REQUIRED arguments and set CRYPTOPP_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CryptoPP  DEFAULT_MSG  CryptoPP_LIBRARY  CryptoPP_INCLUDE_DIR)
-
-set ( CryptoPP_FOUND FALSE )
-
-if ( ${CRYPTOPP_FOUND} )
-        set ( CryptoPP_FOUND TRUE )
-        set ( CryptoPP_INCLUDE_DIRS ${CryptoPP_INCLUDE_DIR} )
-        set ( CryptoPP_LIBRARIES ${CryptoPP_LIBRARY} )
-endif ()
-
-MARK_AS_ADVANCED(CryptoPP_INCLUDE_DIR CryptoPP_LIBRARY)        
-
+# - Find Crypto++
+
+if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+   set(CRYPTO++_FOUND TRUE)
+
+else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+  find_path(CRYPTO++_INCLUDE_DIR cryptlib.h
+      /usr/include/crypto++
+      /usr/include/cryptopp
+      /usr/local/include/crypto++
+      /usr/local/include/cryptopp
+      /opt/local/include/crypto++
+      /opt/local/include/cryptopp
+      $ENV{SystemDrive}/Crypto++/include
+      )
+
+  find_library(CRYPTO++_LIBRARIES NAMES cryptopp
+      PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      $ENV{SystemDrive}/Crypto++/lib
+      )
+
+  if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+    set(CRYPTO++_FOUND TRUE)
+    message(STATUS "Found Crypto++: ${CRYPTO++_INCLUDE_DIR}, ${CRYPTO++_LIBRARIES}")
+  else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+    set(CRYPTO++_FOUND FALSE)
+    message(STATUS "Crypto++ not found.")
+  endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+
+  mark_as_advanced(CRYPTO++_INCLUDE_DIR CRYPTO++_LIBRARIES)
+
+endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)