diff --git a/CMakeLists.txt b/CMakeLists.txt index 41ee30021..89e912580 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,8 +293,6 @@ endif() #Maybe have an option guarding this? set(SLS_INTERNAL_RAPIDJSON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/rapidjson) -set(SLS_INTERNAL_QWT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/qwt-6.1.5) - set(ClangFormat_EXCLUDE_PATTERNS "build/" "libs/" "slsDetectorCalibration/" diff --git a/README.md b/README.md index 3727bb07f..d8d26f2d4 100644 --- a/README.md +++ b/README.md @@ -265,20 +265,13 @@ conda create -n myenv slsdetgui=7.0.0 conda activate myenv ``` -2. Using system installation on RHEL7 +2. Using system installation on RHEL7/RHEL8 ``` yum install qt5-qtbase-devel.x86_64 -yum install qt5-qtsvg-devel.x86_64 +yum install qt5-qtsvg-devel.x86_64 ``` -3. Using system installation on RHEL8 -``` -yum install qt5-qtbase-devel.x86_64 -yum install qt5-qtsvg-devel.x86_64 -yum install expat-devel.x86_64 -``` - -4. Using conda +3. Using conda ``` #Add channels for dependencies and our library conda config --add channels conda-forge diff --git a/conda-recipes/main-library/meta.yaml b/conda-recipes/main-library/meta.yaml index 1c495645d..adc7c177e 100755 --- a/conda-recipes/main-library/meta.yaml +++ b/conda-recipes/main-library/meta.yaml @@ -28,7 +28,6 @@ requirements: - libgl-devel # [linux] - libtiff - zlib - - expat - zeromq - fmt diff --git a/docs/src/installation.rst b/docs/src/installation.rst index 43506b25d..0dfb85a36 100644 --- a/docs/src/installation.rst +++ b/docs/src/installation.rst @@ -322,22 +322,14 @@ using this compiler conda activate myenv -2. Using system installation on RHEL7 +2. Using system installation on RHEL7/RHEL8 .. code-block:: bash yum install qt5-qtbase-devel.x86_64 - yum install qt5-qtsvg-devel.x86_64 + yum install qt5-qtsvg-devel.x86_64 -3. Using system installation on RHEL8 - - .. code-block:: bash - - yum install qt5-qtbase-devel.x86_64 - yum install qt5-qtsvg-devel.x86_64 - yum install expat-devel.x86_64 - -4. Using conda +3. Using conda .. code-block:: bash diff --git a/libs/qwt/CMakeLists.txt b/libs/qwt/CMakeLists.txt index be7986822..2ffb33e22 100644 --- a/libs/qwt/CMakeLists.txt +++ b/libs/qwt/CMakeLists.txt @@ -8,18 +8,25 @@ set(PROJECT_VERSION 6.1.5) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -# Extract qwt sources from the supplied source file -set(INTERNALQWTDIR "qwt-source/") -set(QWTBASE ${CMAKE_CURRENT_BINARY_DIR}/${INTERNALQWTDIR}) -file(MAKE_DIRECTORY ${QWTBASE}) -execute_process( - COMMAND tar -xf ${CMAKE_CURRENT_SOURCE_DIR}/qwt-6.1.5.tar.bz2 -C ${QWTBASE} --strip-components=1 - RESULT_VARIABLE ret -) -if(ret AND NOT ret EQUAL 0) - message( FATAL_ERROR "Could not unpack qwt") +# cmake_minimum_required above resets the policies set in the top level file +if (${CMAKE_VERSION} VERSION_GREATER "3.24") + cmake_policy(SET CMP0135 NEW) #Fetch content download timestamp endif() +# Extract qwt sources from the supplied source file. FetchContent unpacks +# with the archive support built into CMake, so neither tar nor bzip2 has +# to be installed. The archive has no top level CMakeLists.txt, so nothing +# is added to the build here. +include(FetchContent) +FetchContent_Declare( + qwt_source + URL ${CMAKE_CURRENT_SOURCE_DIR}/qwt-6.1.5.tar.bz2 + # Compute hash: md5sum qwt-6.1.5.tar.bz2 + URL_HASH MD5=d65582f99312796ed42c3be3208ed3db +) +FetchContent_MakeAvailable(qwt_source) +set(QWTBASE ${qwt_source_SOURCE_DIR}) + # Without this define moc files are not included and linking of examples fails. add_definitions(-DQWT_MOC_INCLUDE) @@ -35,8 +42,8 @@ find_package(Qt5 REQUIRED ) -file(GLOB QWT_SOURCES ${QWTBASE}src/*.cpp) -file(GLOB QWT_HEADERS ${QWTBASE}src/*.h) +file(GLOB QWT_SOURCES ${QWTBASE}/src/*.cpp) +file(GLOB QWT_HEADERS ${QWTBASE}/src/*.h) add_library(qwt STATIC ${QWT_SOURCES} ${QWT_HEADERS} ) target_include_directories(qwt SYSTEM PUBLIC $ diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index b78ccdd95..48190b12f 100755 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -91,7 +91,6 @@ target_include_directories(slsDetectorGui PUBLIC "$" "$" "$" - "$" "$" ) @@ -103,7 +102,6 @@ target_link_libraries(slsDetectorGui PUBLIC Qt5::Widgets Qt5::Gui Qt5::Core - expat PRIVATE slsProjectWarnings