prepare for CPP-IPFS

master
Melroy van den Berg 2020-12-04 23:14:53 +01:00
parent 78f4f13d90
commit f777bf2eac
3 changed files with 10 additions and 5 deletions

View File

@ -1,5 +1,4 @@
cmake_minimum_required (VERSION 3.5)
cmake_minimum_required (VERSION 3.11.0)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@ -20,6 +19,9 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
include(packaging)
endif()
# Disable CTest testcases in cpp-ipfs-http-client
set (BUILD_TESTING OFF CACHE BOOL "Disable CTest" FORCE)
add_subdirectory (lib/commonmarker/src)
add_subdirectory (lib/commonmarker/extensions)
add_subdirectory (lib/ipfs-http-client)

View File

@ -17,6 +17,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(PROJECT_TARGET browser)
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)
@ -56,8 +57,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
endif()
endif()
# Get include list the cmark binary directory for config.h, .._version.h & .._export.h
# Get include list the cmark extensions binary directory for ..._export.h
# Get include list the cmark binary directory for the generated config.h, .._version.h & .._export.h files
# Get include list the cmark extensions binary directory for the generated ..._export.h file
get_property(CMAKE_BINARY_DIR GLOBAL PROPERTY COMMONMARKER_BINARY_DIR)
get_property(CMAKE_EXTENSIONS_BINARY_DIR GLOBAL PROPERTY COMMONMARKER_EXTENSIONS_BINARY_DIR)
@ -68,6 +69,7 @@ target_include_directories(${PROJECT_TARGET} PRIVATE
${GTKMM_INCLUDE_DIRS}
${CAIRO_INCLUDE_DIRS}
lib/commonmarker/src
lib/ipfs-http-client/include
)
target_link_directories(${PROJECT_TARGET} PRIVATE
@ -75,6 +77,6 @@ target_link_directories(${PROJECT_TARGET} PRIVATE
${CAIRO_LIBRARY_DIRS}
)
target_link_libraries(${PROJECT_TARGET} PRIVATE LibCommonMarker LibCommonMarkerExtensions Threads::Threads ${CXX_FILESYSTEM_LIBRARIES} ${GTKMM_LIBRARIES} ${CAIRO_LIBRARIES})
target_link_libraries(${PROJECT_TARGET} PRIVATE LibCommonMarker LibCommonMarkerExtensions ipfs-http-client Threads::Threads ${CXX_FILESYSTEM_LIBRARIES} ${GTKMM_LIBRARIES} ${CAIRO_LIBRARIES})
install(TARGETS ${PROJECT_TARGET} RUNTIME DESTINATION "bin" COMPONENT applications)

View File

@ -1,6 +1,7 @@
#include "mainwindow.h"
#include <gtkmm/application.h>
int main(int argc, char *argv[])
{
auto app = Gtk::Application::create(argc, argv, "org.melroy.browser");