File tree Expand file tree Collapse file tree 2 files changed +14
-3
lines changed
include/salmon/internal/config Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -388,14 +388,25 @@ if(NOT libgff_FOUND)
388388 URL_HASH SHA256=96d2bda64aaf9cf7b6c1a42205e408b0ef2a353ba42dad560db215e7ec105e2e
389389 )
390390 FetchContent_MakeAvailable (salmon_libgff)
391+ # libgff's upstream install() rule hardcodes installation from
392+ # ${CMAKE_BINARY_DIR}/libgff.a. Ensure the fetched target writes there.
393+ if (TARGET gff)
394+ set_target_properties (gff PROPERTIES
395+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} " )
396+ foreach (_salmon_cfg Debug Release RelWithDebInfo MinSizeRel)
397+ string (TOUPPER "${_salmon_cfg} " _salmon_cfg_upper)
398+ set_target_properties (gff PROPERTIES
399+ "ARCHIVE_OUTPUT_DIRECTORY_${_salmon_cfg_upper} " "${CMAKE_BINARY_DIR} " )
400+ endforeach ()
401+ endif ()
391402 # Suppress -Wclass-memaccess from libgff's GVec.hh using memset on non-trivial types
392403 if (TARGET gff AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
393404 target_compile_options (gff PRIVATE -Wno-class-memaccess )
394405 endif ()
395406 set (FETCHED_GFF TRUE )
396407 set (LIB_GFF_PATH ${salmon_libgff_SOURCE_DIR} )
397408 set (LIB_GFF_INCLUDE_DIR ${salmon_libgff_SOURCE_DIR} /include)
398- set (LIB_GFF_LIBRARY_DIR ${salmon_libgff_BINARY_DIR } )
409+ set (LIB_GFF_LIBRARY_DIR ${CMAKE_BINARY_DIR } )
399410endif ()
400411
401412find_package (CURL QUIET )
Original file line number Diff line number Diff line change 2828namespace salmon {
2929constexpr char majorVersion[] = " 1" ;
3030constexpr char minorVersion[] = " 11" ;
31- constexpr char patchVersion[] = " 0 " ;
32- constexpr char version[] = " 1.11.0 " ;
31+ constexpr char patchVersion[] = " 4 " ;
32+ constexpr char version[] = " 1.11.4 " ;
3333constexpr uint32_t indexVersion = 6 ;
3434constexpr char requiredQuasiIndexVersion[] = " p8" ;
3535} // namespace salmon
You can’t perform that action at this time.
0 commit comments