X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=0a754020586f10839fadceef949d09d9a4f16559;hp=7bc13e05da62379b2c6e82497b60efbe198048fe;hb=b087ba7fd88610cbf54f6371367c7b9f9829dc63;hpb=b42d25c43e52c900cbdd3e5cde0282961b8721e7 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bc13e05..0a754020 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ cmake_minimum_required(VERSION 2.6) include(FindPkgConfig) +include(GNUInstallDirs) project(pulseview) @@ -55,7 +56,7 @@ list(APPEND PKGDEPS ) if(ENABLE_SIGROKDECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.1.0) + list(APPEND PKGDEPS libsigrokdecode>=0.2.0) endif() find_package(PkgConfig) @@ -100,6 +101,7 @@ configure_file ( set(pulseview_SOURCES main.cpp + pv/devicemanager.cpp pv/mainwindow.cpp pv/sigsession.cpp pv/data/analog.cpp @@ -225,12 +227,21 @@ add_executable(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) +if(WIN32) +# Pass -mwindows so that no "DOS box" will open when PulseView is started. +set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows") +endif() + #=============================================================================== #= Installation #------------------------------------------------------------------------------- +# Install the executable. install(TARGETS ${PROJECT_NAME} DESTINATION bin/) +# Install the manpage. +install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) + #=============================================================================== #= Packaging (handled by CPack) #-------------------------------------------------------------------------------