Skip to content

fix: make project buildable with CMake 4+ #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make project buildable with CMake 4+ #886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##

cmake_minimum_required(VERSION 2.8.6)
cmake_minimum_required(VERSION 3.10)

project(DSView)

Expand All @@ -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)

Expand Down Expand Up @@ -130,7 +130,7 @@ else()
message(FATAL_ERROR "Please install lib python3!")
endif()
endif()

#===============================================================================
#= FFTW
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -449,7 +449,7 @@ set(DSView_HEADERS
DSView/pv/ui/fn.h
DSView/pv/ui/xtoolbutton.h
)

#===============================================================================
#= libsigrok4DSL source
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -492,7 +492,7 @@ set(libsigrok4DSL_HEADERS
libsigrok4DSL/hardware/DSL/command.h
libsigrok4DSL/hardware/DSL/dsl.h
)

#===============================================================================
#= libsigrokdecode4DSL source
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -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)
Expand Down