martin/kima2
1
1
Fork 0
Code Issues Pull requests Releases 26 Wiki Activity

Merge branch 'nlohmann'

Browse source
This commit is contained in:
Martin Brodbeck 2018-10-19 10:01:46 +02:00
commit 6dbd2919bd
7 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -21,6 +21,13 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
option(KIMA2_USE_EXTERNAL_JSON "Use an external JSON library" OFF)
if(KIMA2_USE_EXTERNAL_JSON)
find_package(nlohmann_json REQUIRED)
endif()
add_subdirectory(3rdparty)
add_subdirectory(src)
if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES Debug)
@ -57,7 +64,7 @@ else(WIN32 AND NOT UNIX)
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_GENERATOR "RPM;DEB")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5printsupport5 (>= 5.4), libjsoncpp1, libusb-1.0-0")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5printsupport5 (>= 5.4), libusb-1.0-0")
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
"/usr/share/applications"
"/usr/share/icons"
@ -90,7 +97,6 @@ if( MINGW )
${MINGW_PATH}/libicuuc62.dll
${MINGW_PATH}/libicuin62.dll
${MINGW_PATH}/libicudt62.dll
${MINGW_PATH}/libjsoncpp-20.dll
${MINGW_PATH}/libpcre2-16-0.dll
${MINGW_PATH}/zlib1.dll
${MINGW_PATH}/libharfbuzz-0.dll