diff --git a/CMakeLists.txt b/CMakeLists.txt index cc82669f..53c700be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ ## along with this program. If not, see . ## -cmake_minimum_required(VERSION 2.8.6) +cmake_minimum_required(VERSION 3.10) project(DSView) @@ -46,8 +46,8 @@ configure_file ( include(FindPkgConfig) include(GNUInstallDirs) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") -#list(APPEND CMAKE_PREFIX_PATH "xxx.cmake find path") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") +#list(APPEND CMAKE_PREFIX_PATH "xxx.cmake find path") find_package(PkgConfig) @@ -130,7 +130,7 @@ else() message(FATAL_ERROR "Please install lib python3!") endif() endif() - + #=============================================================================== #= FFTW #------------------------------------------------------------------------------- @@ -300,7 +300,7 @@ set(DSView_SOURCES DSView/pv/dialogs/protocolexp.cpp DSView/pv/dialogs/fftoptions.cpp DSView/pv/data/mathstack.cpp - DSView/pv/view/mathtrace.cpp + DSView/pv/view/mathtrace.cpp DSView/pv/toolbars/titlebar.cpp DSView/pv/mainframe.cpp DSView/pv/widgets/border.cpp @@ -421,7 +421,7 @@ set(DSView_HEADERS DSView/pv/view/signal.h DSView/pv/view/logicsignal.h DSView/pv/view/analogsignal.h - DSView/pv/view/dsosignal.h + DSView/pv/view/dsosignal.h DSView/pv/dock/protocoldock.h DSView/pv/data/decoderstack.h DSView/pv/view/decodetrace.h @@ -449,7 +449,7 @@ set(DSView_HEADERS DSView/pv/ui/fn.h DSView/pv/ui/xtoolbutton.h ) - + #=============================================================================== #= libsigrok4DSL source #------------------------------------------------------------------------------- @@ -492,7 +492,7 @@ set(libsigrok4DSL_HEADERS libsigrok4DSL/hardware/DSL/command.h libsigrok4DSL/hardware/DSL/dsl.h ) - + #=============================================================================== #= libsigrokdecode4DSL source #------------------------------------------------------------------------------- @@ -668,9 +668,9 @@ install(FILES DSView/icons/logo.svg DESTINATION share/DSView RENAME logo.svg) install(FILES DSView/icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg) install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) -if(CMAKE_SYSTEM_NAME MATCHES "Linux") +if(CMAKE_SYSTEM_NAME MATCHES "Linux") install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) - + add_compile_definitions(_DEFAULT_SOURCE) if(IS_DIRECTORY /usr/lib/udev/rules.d)