Revised build files

Author: Krzysztof Okupski

.travis.yml

@@ -16,5 +16,6 @@ before_script:
   - cd build
   - cmake ..
 
-script: make
+script:
+  - make
 

CMakeLists.txt

@@ -7,9 +7,11 @@ SET(MINOR_VERSION 0)
 
 # Add source directory
 ADD_SUBDIRECTORY(src/api)
-ADD_SUBDIRECTORY(src/jsonrpc)
 
-# ADD_SUBDIRECTORY(test)
+FIND_PACKAGE(Boost COMPONENTS unit_test_framework)
+IF(Boost_FOUND)
+    ADD_SUBDIRECTORY(src/test)
+ENDIF()
 
 # Set package settings
 IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")

src/api/CMakeLists.txt

@@ -5,20 +5,16 @@ SET(CMAKE_CXX_FLAGS "-std=c++11 -g -Wall")
 FILE(GLOB bitcoinapi_header ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
 FILE(GLOB bitcoinapi_source ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
+# Add jsonrpc directory
+ADD_SUBDIRECTORY(jsonrpc)
+
 # Set target libraries
 ADD_LIBRARY(bitcoinapi SHARED ${bitcoinapi_source})
 ADD_LIBRARY(bitcoinapi_static STATIC ${bitcoinapi_source})
 
-# Add boost header include
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
 # Set output name of static library
 SET_TARGET_PROPERTIES(bitcoinapi_static PROPERTIES OUTPUT_NAME bitcoinapi)
 
-# Set version number of both libraries
-SET(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) 
-SET_TARGET_PROPERTIES(bitcoinapi bitcoinapi_static PROPERTIES VERSION "${VERSION_STRING}" SOVERSION "${VERSION_MAJOR}")
-
 # Link the library with jsonrpc libs
 TARGET_LINK_LIBRARIES(bitcoinapi jsonrpc)
 TARGET_LINK_LIBRARIES(bitcoinapi_static jsonrpc)

src/api/jsonrpc/CMakeLists.txt

@@ -0,0 +1,33 @@
+# Set compiler settings
+SET(CMAKE_CXX_FLAGS "-std=c++11 -g -Wall")
+SET(CMAKE_C_FLAGS "-Wall")
+
+# Require curl to be present
+FIND_PACKAGE(Threads REQUIRED)
+FIND_PACKAGE(CURL REQUIRED)
+
+# Find header and source files
+FILE(GLOB jsonrpc_header ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+FILE(GLOB connector_header ${CMAKE_CURRENT_SOURCE_DIR}/connectors/*.h)
+FILE(GLOB jsoncpp_header ${CMAKE_CURRENT_SOURCE_DIR}/json/*.h)
+FILE(GLOB_RECURSE jsonrpc_source ${CMAKE_CURRENT_SOURCE_DIR}/*.c*)
+
+# Set target libraries
+ADD_LIBRARY(jsonrpc SHARED ${jsonrpc_source})
+ADD_LIBRARY(jsonrpc_static STATIC ${jsonrpc_source})
+
+# Set output name of static library
+SET_TARGET_PROPERTIES(jsonrpc_static PROPERTIES OUTPUT_NAME jsonrpc)
+
+# Link the library with dependencies
+TARGET_LINK_LIBRARIES(jsonrpc pthread dl curl)
+TARGET_LINK_LIBRARIES(jsonrpc_static pthread dl curl)
+
+# Install to appropriate destinations
+INSTALL(FILES ${jsonrpc_header} DESTINATION include/jsonrpc) 
+INSTALL(FILES ${connector_header} DESTINATION include/jsonrpc/connectors)
+INSTALL(FILES ${jsoncpp_header} DESTINATION include/jsonrpc/json) 
+
+INSTALL(TARGETS jsonrpc jsonrpc_static
+            LIBRARY DESTINATION lib
+            ARCHIVE DESTINATION lib)