update to current monero master branch

CMakeLists.txt

@@ -138,12 +138,13 @@ set(LIBRARIES
         myext
         mstch
         wallet
-        blockchain_db
-        device
-        ${WALLET_CRYPTO}
         cryptonote_core
-        cryptonote_protocol
         cryptonote_basic
+        cryptonote_protocol
+        cryptonote_format_utils_basic
+        blockchain_db
+        device
+        ${WALLET_CRYPTO} 
         multisig
         daemonizer
         blocks

cmake/FindMonero.cmake

@@ -67,6 +67,13 @@ if (EXISTS ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
 			PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a)
 endif()
 
+if (EXISTS ${MONERO_BUILD_DIR}/src/cryptonote_basic/libcryptonote_format_utils_basic.a)
+        message(STATUS FindMonero " found libcryptonote_format_utils_basic.a")
+        add_library(cryptonote_format_utils_basic STATIC IMPORTED)
+        set_property(TARGET cryptonote_format_utils_basic
+                PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/cryptonote_basic/libcryptonote_format_utils_basic.a)
+endif()
+
 
 message(STATUS ${MONERO_SOURCE_DIR}/build)