Merge pull request #1589 from larryk85/fix/add_back_cmake_defaults

Fix/add back cmake defaults

CMakeLists.txt

 # Defines EOS library target.
 project( EOS )
+
 cmake_minimum_required( VERSION 2.8.12 )
 
 enable_testing()
@@ -45,6 +46,34 @@ if (USE_PCH)
   include (cotire)
 endif(USE_PCH)
 
+# add defaults for openssl
+if ("${OPENSSL_ROOT_DIR}" STREQUAL "")
+   if (NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "")
+      set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
+      set(OPENSSL_INCLUDE_DIR ${OPENSSL_ROOT_DIR}/include)
+   elseif (APPLE)
+      set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
+      set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include")
+   elseif(UNIX AND NOT APPLE)
+      set(OPENSSL_ROOT_DIR "/usr/include/openssl")
+      set(OPENSSL_INCLUDE_DIR "/usr/include/openssl/include")
+   else()
+      message(FATAL_ERROR "openssl not found and don't know where to look, please specify OPENSSL_ROOT_DIR")
+   endif()
+endif()
+
+if ("${OPENSSL_LIBRARIES}" STREQUAL "")
+   if (NOT "$ENV{OPENSSL_LIBRARIES}" STREQUAL "")
+      set(OPENSSL_LIBRARIES $ENV{OPENSSL_LIBRARIES})
+   elseif (APPLE)
+      set(OPENSSL_LIBRARIES "/usr/local/opt/openssl/lib")
+   elseif(UNIX AND NOT APPLE)
+      set(OPENSSL_LIBRARIES "/usr/include/openssl")
+   else()
+      message(FATAL_ERROR "openssl libs not found and don't know where to look, please specify OPENSSL_LIBRARIES")
+   endif()
+endif()
+
 if(UNIX)
   if(APPLE)
     set(whole_archive_flag "-force_load")

CMakeModules/FindSoftfloat.cmake

 # - Try to find SOFTFLOAT
 
 # TODO: Check if compiler is able to generate wasm32
+if ("${SOFTFLOAT_ROOT}" STREQUAL "")
+   if (NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "")
+      set(SOFTFLOAT_ROOT $ENV{SOFTFLOAT_ROOT})
+   elseif (APPLE)
+      set(SOFTFLOAT_ROOT "/usr/local/berkeley-softfloat-3")
+   elseif(UNIX AND NOT APPLE)
+      set(SOFTFLOAT_ROOT "/opt/berkeley-softfloat-3")
+   else()
+      message(FATAL_ERROR "softfloat not found and don't know where to look, please specify SOFTFLOAT_ROOT")
+   endif()
+endif()
 message( STATUS "Looking for softfloat library" )
 find_library( SOFTFLOAT_LIB libsoftfloat.a PATHS ${SOFTFLOAT_ROOT} NO_DEFAULT_PATH )

CMakeModules/FindWasm.cmake

 # - Try to find WASM
 
 # TODO: Check if compiler is able to generate wasm32
+if ("${WASM_ROOT}" STREQUAL "")
+   #   if (NOT "$ENV{WASM_ROOT}" STREQUAL "")
+   #   set( WASM_ROOT $ENV{WASM_ROOT} )
+   if (APPLE)
+      set( WASM_ROOT "/usr/local/wasm" )
+   elseif (UNIX AND NOT APPLE)
+      set( WASM_ROOT "/opt/wasm" )
+   else()
+      message(FATAL_ERROR "WASM not found and don't know where to look, please specify WASM_ROOT")
+   endif()
+endif()
 find_program(WASM_CLANG clang PATHS ${WASM_ROOT}/bin NO_DEFAULT_PATH)
 find_program(WASM_LLC llc PATHS ${WASM_ROOT}/bin NO_DEFAULT_PATH)
 find_program(WASM_LLVM_LINK llvm-link PATHS ${WASM_ROOT}/bin NO_DEFAULT_PATH)