Merge branch 'trunk' into develop

This commit is contained in:
Maarten L. Hekkelman
2025-08-04 10:03:07 +02:00

View File

@@ -53,7 +53,7 @@ option(INSTALL_LIBRARY "Install the libdssp library" OFF)
if(BUILD_FOR_CCP4)
if("$ENV{CCP4}" STREQUAL "" OR NOT EXISTS $ENV{CCP4})
message(FATAL_ERROR "A CCP4 built was requested but CCP4 was not sourced")
message(FATAL_ERROR "dssp: A CCP4 built was requested but CCP4 was not sourced")
else()
list(APPEND CMAKE_MODULE_PATH "$ENV{CCP4}")
list(APPEND CMAKE_PREFIX_PATH "$ENV{CCP4}")
@@ -109,7 +109,7 @@ find_package(mrc QUIET)
if(MRC_FOUND)
option(USE_RSRC "Use mrc to create resources" ON)
else()
message(STATUS "Not using resources since mrc was not found")
message(STATUS "dssp: Not using resources since mrc was not found")
endif()
set(CMAKE_THREAD_PREFER_PTHREAD)