From: Matthias Maier Date: Fri, 3 Mar 2023 21:03:19 +0000 (-0600) Subject: CMake: FindDEAL_II_P4EST: do not use optimized/debug/general X-Git-Tag: v9.5.0-rc1~446^2~9 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fbce589b895a6b439429588e84c4e3b85d2f16c;p=dealii.git CMake: FindDEAL_II_P4EST: do not use optimized/debug/general --- diff --git a/cmake/modules/FindDEAL_II_P4EST.cmake b/cmake/modules/FindDEAL_II_P4EST.cmake index 5309bdc68d..b54a3dd11c 100644 --- a/cmake/modules/FindDEAL_II_P4EST.cmake +++ b/cmake/modules/FindDEAL_II_P4EST.cmake @@ -92,12 +92,13 @@ if( ( "${P4EST_LIBRARY_OPTIMIZED}" STREQUAL "${P4EST_LIBRARY_DEBUG}" AND "${SC_LIBRARY_OPTIMIZED}" STREQUAL "${SC_LIBRARY_DEBUG}" ) OR P4EST_LIBRARY_DEBUG MATCHES "-NOTFOUND" OR SC_LIBRARY_DEBUG MATCHES "-NOTFOUND" ) - set(_libraries P4EST_LIBRARY_OPTIMIZED SC_LIBRARY_OPTIMIZED) + set(_libraries + LIBRARIES REQUIRED P4EST_LIBRARY_OPTIMIZED SC_LIBRARY_OPTIMIZED + ) else() set(_libraries - optimized P4EST_LIBRARY_OPTIMIZED SC_LIBRARY_OPTIMIZED - debug P4EST_LIBRARY_DEBUG SC_LIBRARY_DEBUG - general + LIBRARIES_RELEASE REQUIRED P4EST_LIBRARY_OPTIMIZED SC_LIBRARY_OPTIMIZED + LIBRARIES_DEBUG REQUIRED P4EST_LIBRARY_DEBUG SC_LIBRARY_DEBUG ) endif() @@ -199,9 +200,8 @@ if(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h) endif() process_feature(P4EST - LIBRARIES - REQUIRED ${_libraries} - OPTIONAL LAPACK_LIBRARIES MPI_C_LIBRARIES + ${_libraries} + LIBRARIES OPTIONAL LAPACK_LIBRARIES MPI_C_LIBRARIES INCLUDE_DIRS REQUIRED P4EST_INCLUDE_DIR SC_INCLUDE_DIR CLEAR