common changes

alethzero/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_policy(SET CMP0015 OLD)
+#cmake_policy(SET CMP0015 OLD)
 #set(CMAKE_AUTOMOC OFF)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -37,7 +37,9 @@ endif ()
 
 qt5_use_modules(${EXECUTABLE} Core)
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
+#target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
+#target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY})
+#target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY})
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} qethereum)
 target_link_libraries(${EXECUTABLE} ethereum)

extdep/CMakeLists.txt

@@ -22,3 +22,8 @@ include(leveldb.cmake)
 
 # will be re-eanbled later
 # include(miniupnpc.cmake)
+
+
+# BUG
+# becouse extdep/cmakelist.txt is subfolder of ethereum project its being install into binary destination on macos. it's a bug
+

extdep/leveldb.cmake

@@ -1,11 +1,11 @@
-if(APPLE)
+if (APPLE)
 ExternalProject_Add(leveldb
     DEPENDS snappy
 	URL https://leveldb.googlecode.com/files/leveldb-1.15.0.tar.gz 
 	BINARY_DIR leveldb-prefix/src/leveldb
 	CONFIGURE_COMMAND patch < ${CMAKE_CURRENT_SOURCE_DIR}/leveldb_osx.patch
 	BUILD_COMMAND export ETH_DEPENDENCY_INSTALL_DIR=${ETH_DEPENDENCY_INSTALL_DIR} && make -j 3
-	INSTALL_COMMAND cp -rf include/leveldb ${ETH_DEPENDENCY_INSTALL_DIR}/include/ && mv libleveldb.a ${ETH_DEPENDENCY_INSTALL_DIR}/lib && mv libleveldb.dylib.1.15 ${ETH_DEPENDENCY_INSTALL_DIR}/lib/libleveldb.dylib
+	INSTALL_COMMAND cp -rf include/leveldb ${ETH_DEPENDENCY_INSTALL_DIR}/include/ && cp libleveldb.a ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp libleveldb.dylib.1.15 ${ETH_DEPENDENCY_INSTALL_DIR}/lib/libleveldb.dylib
 	)
 elseif(WIN32)
 ExternalProject_Add(leveldb

libqethereum/CMakeLists.txt

@@ -17,7 +17,10 @@ else()
 endif()
 
 qt5_use_modules(${EXECUTABLE} Core Gui WebKit WebKitWidgets Widgets Network Quick Qml)
-target_link_libraries(${EXECUTABLE} ethereum secp256k1 ${JSON_RPC_CPP_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ethereum)
+target_link_libraries(${EXECUTABLE} secp256k1)
+target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY})
+target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY})
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

libweb3jsonrpc/CMakeLists.txt

@@ -19,7 +19,8 @@ endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
-target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY})
+target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY})
 
 if (MINIUPNPC_LS)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})

test/CMakeLists.txt

@@ -24,6 +24,7 @@ target_link_libraries(testeth ${CRYPTOPP_LIBRARIES})
 if(JSON_RPC_CPP_FOUND)
     target_link_libraries(testeth ${JSONCPP_LIBRARIES})
 	target_link_libraries(testeth web3jsonrpc)
+	target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARY})
 endif()
 
 target_link_libraries(createRandomTest ethereum)