From 4faffe3834287b7d0c1dd9e6de55aa8084104986 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Mon, 18 May 2020 17:44:06 +0200
Subject: [PATCH] use pwiz target
---
CMakeStuff/toolchains/unix-toolchain.cmake | 2 ++
src/CMakeLists.txt | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeStuff/toolchains/unix-toolchain.cmake b/CMakeStuff/toolchains/unix-toolchain.cmake
index 02dfc5b6..cddabda6 100644
--- a/CMakeStuff/toolchains/unix-toolchain.cmake
+++ b/CMakeStuff/toolchains/unix-toolchain.cmake
@@ -31,3 +31,5 @@ find_package(Zstd REQUIRED)
set(Pwiz_DIR ${CMAKE_MODULE_PATH})
find_package(Pwiz REQUIRED)
+
+MESSAGE(STATUS "Found Pwiz: ${Pwiz_LIBRARY}")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63a2805a..cf1c228d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -222,7 +222,6 @@ message("XTPCPP_SRCS: ${XTPCPP_SRCS}")
add_executable(xtpcpp main.cpp ${CPP_FILES} ${XTPCPP_SRCS} ${GUI_UI_HDRS} ${xtpcpp_RCC_SRCS})
target_include_directories(xtpcpp PUBLIC
- ${Pwiz_INCLUDE_DIR}
${QCustomPlot_INCLUDES}
${QUAZIP_INCLUDE_DIR}
)
@@ -246,7 +245,7 @@ if(MINGW)
OdsStream::Core
PappsoMSpp::Core
PappsoMSpp::Widget
- ${Pwiz_LIBRARY}
+ Pwiz::Pwiz
${QCustomPlot_LIBRARIES}
${ZLIB_LIBRARIES}
Qt5::Gui
@@ -283,6 +282,7 @@ else(MINGW)
ZLIB::ZLIB
Alglib::Alglib
Zstd::Zstd
+ Pwiz::Pwiz
)
endif(MINGW)
--
GitLab