Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion config/export_pc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ function(resolve_pc_libs out_var root_target)

_resolve("${root_target}")

# Remove the duplicates by keeping the first occurrence
list(REMOVE_DUPLICATES _result)

# Reverse the order
list(REVERSE _result)
#list(REMOVE_DUPLICATES _result)

set(${out_var} "${_result}" PARENT_SCOPE)
endfunction()
Expand Down
44 changes: 22 additions & 22 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ macro(ADD_SUBDIR name)
string(TOUPPER "${name}" uname)
if (STDLIB_${uname})
add_subdirectory(${name})
list(APPEND OPTIONAL_LIB ${name})
list(APPEND OPTIONAL_LIB ${PROJECT_NAME}_${name})
endif()
endmacro()

Expand Down Expand Up @@ -56,26 +56,26 @@ set(f90Files
configure_stdlib_target(${PROJECT_NAME} f90Files fppFiles cppFiles)

target_link_libraries(${PROJECT_NAME} PUBLIC
array
constants
core
hash
intrinsics
io
linalg_core
linalg_iterative
linalg
logger
math
quadrature
selection
specialfunctions
specialmatrices
sorting
stringlist
strings
system
blas lapack lapack_extended
sparse
${PROJECT_NAME}_array
${PROJECT_NAME}_constants
${PROJECT_NAME}_core
${PROJECT_NAME}_hash
${PROJECT_NAME}_intrinsics
${PROJECT_NAME}_io
${PROJECT_NAME}_linalg_core
${PROJECT_NAME}_linalg_iterative
${PROJECT_NAME}_linalg
${PROJECT_NAME}_logger
${PROJECT_NAME}_math
${PROJECT_NAME}_quadrature
${PROJECT_NAME}_selection
${PROJECT_NAME}_specialfunctions
${PROJECT_NAME}_specialmatrices
${PROJECT_NAME}_sorting
${PROJECT_NAME}_stringlist
${PROJECT_NAME}_strings
${PROJECT_NAME}_system
${PROJECT_NAME}_blas ${PROJECT_NAME}_lapack ${PROJECT_NAME}_lapack_extended
${PROJECT_NAME}_sparse
${OPTIONAL_LIB}
)
4 changes: 2 additions & 2 deletions src/ansi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ set(ansi_f90Files
set(ansi_fppFiles
)

configure_stdlib_target(ansi ansi_f90Files ansi_fppFiles "")
configure_stdlib_target(${PROJECT_NAME}_ansi ansi_f90Files ansi_fppFiles "")

target_link_libraries(ansi PUBLIC core strings)
target_link_libraries(${PROJECT_NAME}_ansi PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_strings)
2 changes: 1 addition & 1 deletion src/array/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ set(array_f90Files
stdlib_array.f90
)

configure_stdlib_target(array array_f90Files array_fppFiles array_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_array array_f90Files array_fppFiles array_cppFiles)
4 changes: 2 additions & 2 deletions src/bitsets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set(bitsets_fppFiles
stdlib_bitsets_large.fypp
)

configure_stdlib_target(bitsets "" bitsets_fppFiles "")
configure_stdlib_target(${PROJECT_NAME}_bitsets "" bitsets_fppFiles "")

target_link_libraries(bitsets PUBLIC core)
target_link_libraries(${PROJECT_NAME}_bitsets PUBLIC ${PROJECT_NAME}_core)
6 changes: 3 additions & 3 deletions src/blas/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ set(blas_cppFiles
stdlib_linalg_blas.fypp
)

configure_stdlib_target(blas "" blas_fppFiles blas_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_blas "" blas_fppFiles blas_cppFiles)

if(BLAS_FOUND)
target_link_libraries(blas PUBLIC "BLAS::BLAS")
target_link_libraries(${PROJECT_NAME}_blas PUBLIC "BLAS::BLAS")
endif()
target_link_libraries(blas PUBLIC core linalg_core)
target_link_libraries(${PROJECT_NAME}_blas PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_linalg_core)
4 changes: 2 additions & 2 deletions src/constants/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ set(constants_f90Files
stdlib_codata.f90
)

configure_stdlib_target(constants constants_f90Files constants_fppFiles "")
configure_stdlib_target(${PROJECT_NAME}_constants constants_f90Files constants_fppFiles "")

target_link_libraries(constants PUBLIC core)
target_link_libraries(${PROJECT_NAME}_constants PUBLIC ${PROJECT_NAME}_core)
2 changes: 1 addition & 1 deletion src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ set(core_f90Files
stdlib_io_aux.f90
)

configure_stdlib_target(core core_f90Files core_fppFiles core_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_core core_f90Files core_fppFiles core_cppFiles)
4 changes: 2 additions & 2 deletions src/hash/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ set(hash_fppFiles
stdlib_hash_64bit_spookyv2.fypp
)

configure_stdlib_target(hash "" hash_fppFiles "")
configure_stdlib_target(${PROJECT_NAME}_hash "" hash_fppFiles "")

target_link_libraries(hash PUBLIC core)
target_link_libraries(${PROJECT_NAME}_hash PUBLIC ${PROJECT_NAME}_core)
4 changes: 2 additions & 2 deletions src/hashmaps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set(hashmaps_f90Files
stdlib_hashmap_wrappers.f90
)

configure_stdlib_target(hashmaps hashmaps_f90Files "" "")
configure_stdlib_target(${PROJECT_NAME}_hashmaps hashmaps_f90Files "" "")

target_link_libraries(hashmaps PUBLIC hash)
target_link_libraries(${PROJECT_NAME}_hashmaps PUBLIC ${PROJECT_NAME}_hash)
4 changes: 2 additions & 2 deletions src/intrinsics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ set(intrinsics_fppFiles
set(intrinsics_cppFiles
)

configure_stdlib_target(intrinsics "" intrinsics_fppFiles intrinsics_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_intrinsics "" intrinsics_fppFiles intrinsics_cppFiles)

target_link_libraries(intrinsics PUBLIC linalg_core blas constants)
target_link_libraries(${PROJECT_NAME}_intrinsics PUBLIC ${PROJECT_NAME}_linalg_core ${PROJECT_NAME}_blas ${PROJECT_NAME}_constants)
4 changes: 2 additions & 2 deletions src/io/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ set(io_cppFiles
set(io_f90Files
)

configure_stdlib_target(io io_f90Files io_fppFiles io_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_io io_f90Files io_fppFiles io_cppFiles)

target_link_libraries(io PUBLIC core strings)
target_link_libraries(${PROJECT_NAME}_io PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_strings)
6 changes: 3 additions & 3 deletions src/lapack/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ set(lapack_cppFiles
set(lapack_f90Files
)

configure_stdlib_target(lapack lapack_f90Files lapack_fppFiles lapack_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_lapack lapack_f90Files lapack_fppFiles lapack_cppFiles)

if(LAPACK_FOUND)
target_link_libraries(lapack PUBLIC "LAPACK::LAPACK")
target_link_libraries(${PROJECT_NAME}_lapack PUBLIC "LAPACK::LAPACK")
endif()
target_link_libraries(lapack PUBLIC core linalg_core blas strings)
target_link_libraries(${PROJECT_NAME}_lapack PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_linalg_core ${PROJECT_NAME}_blas ${PROJECT_NAME}_strings)
4 changes: 2 additions & 2 deletions src/lapack_extended/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set(lapack_extended_fppFiles
set(lapack_extended_cppFiles
)

configure_stdlib_target(lapack_extended "" lapack_extended_fppFiles lapack_extended_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_lapack_extended "" lapack_extended_fppFiles lapack_extended_cppFiles)

target_link_libraries(lapack_extended PUBLIC core linalg_core)
target_link_libraries(${PROJECT_NAME}_lapack_extended PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_linalg_core)
4 changes: 2 additions & 2 deletions src/linalg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ set(linalg_cppFiles
set(linalg_f90Files
)

configure_stdlib_target(linalg linalg_f90Files linalg_fppFiles linalg_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_linalg linalg_f90Files linalg_fppFiles linalg_cppFiles)

target_link_libraries(linalg PUBLIC core linalg_core constants lapack lapack_extended sorting intrinsics)
target_link_libraries(${PROJECT_NAME}_linalg PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_linalg_core ${PROJECT_NAME}_constants ${PROJECT_NAME}_lapack ${PROJECT_NAME}_lapack_extended ${PROJECT_NAME}_sorting ${PROJECT_NAME}_intrinsics)
4 changes: 2 additions & 2 deletions src/linalg_core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ set(linalg_core_cppFiles
set(linalg_core_f90Files
)

configure_stdlib_target(linalg_core linalg_core_f90Files linalg_core_fppFiles linalg_core_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_linalg_core linalg_core_f90Files linalg_core_fppFiles linalg_core_cppFiles)

target_link_libraries(linalg_core PUBLIC core)
target_link_libraries(${PROJECT_NAME}_linalg_core PUBLIC ${PROJECT_NAME}_core)
4 changes: 2 additions & 2 deletions src/linalg_iterative/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ set(linalg_iterative_cppFiles
set(linalg_iterative_f90Files
)

configure_stdlib_target(linalg_iterative linalg_iterative_f90Files linalg_iterative_fppFiles linalg_iterative_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_linalg_iterative linalg_iterative_f90Files linalg_iterative_fppFiles linalg_iterative_cppFiles)

target_link_libraries(linalg_iterative PUBLIC linalg sparse)
target_link_libraries(${PROJECT_NAME}_linalg_iterative PUBLIC ${PROJECT_NAME}_linalg ${PROJECT_NAME}_sparse)
4 changes: 2 additions & 2 deletions src/logger/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ set(logger_f90Files
stdlib_logger.f90
)

configure_stdlib_target(logger logger_f90Files logger_fppFiles logger_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_logger logger_f90Files logger_fppFiles logger_cppFiles)

target_link_libraries(logger PUBLIC core)
target_link_libraries(${PROJECT_NAME}_logger PUBLIC ${PROJECT_NAME}_core)
6 changes: 3 additions & 3 deletions src/math/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ set(math_cppFiles
stdlib_math.fypp
)

configure_stdlib_target(math "" math_fppFiles math_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_math "" math_fppFiles math_cppFiles)

if(STDLIB_BITSETS)
target_link_libraries(math PUBLIC bitsets)
target_link_libraries(${PROJECT_NAME}_math PUBLIC ${PROJECT_NAME}_bitsets)
endif()

target_link_libraries(math PUBLIC core strings)
target_link_libraries(${PROJECT_NAME}_math PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_strings)
4 changes: 2 additions & 2 deletions src/quadrature/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ set(quadrature_f90Files
stdlib_quadrature_gauss.f90
)

configure_stdlib_target(quadrature quadrature_f90Files quadrature_fppFiles quadrature_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_quadrature quadrature_f90Files quadrature_fppFiles quadrature_cppFiles)

target_link_libraries(quadrature PUBLIC core specialfunctions)
target_link_libraries(${PROJECT_NAME}_quadrature PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_specialfunctions)
4 changes: 2 additions & 2 deletions src/selection/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ set(selection_cppFiles
set(selection_f90Files
)

configure_stdlib_target(selection selection_f90Files selection_fppFiles selection_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_selection selection_f90Files selection_fppFiles selection_cppFiles)

target_link_libraries(selection PUBLIC core)
target_link_libraries(${PROJECT_NAME}_selection PUBLIC ${PROJECT_NAME}_core)
6 changes: 3 additions & 3 deletions src/sorting/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ set(sorting_f90Files
stdlib_sorting_radix_sort.f90
)

configure_stdlib_target(sorting sorting_f90Files sorting_fppFiles sorting_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_sorting sorting_f90Files sorting_fppFiles sorting_cppFiles)

if(STDLIB_BITSETS)
target_link_libraries(sorting PUBLIC bitsets)
target_link_libraries(${PROJECT_NAME}_sorting PUBLIC ${PROJECT_NAME}_bitsets)
endif()

target_link_libraries(sorting PUBLIC core strings)
target_link_libraries(${PROJECT_NAME}_sorting PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_strings)
4 changes: 2 additions & 2 deletions src/sparse/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ set(sparse_f90Files
stdlib_sparse.f90
)

configure_stdlib_target(sparse sparse_f90Files sparse_fppFiles sparse_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_sparse sparse_f90Files sparse_fppFiles sparse_cppFiles)

target_link_libraries(sparse PUBLIC constants sorting)
target_link_libraries(${PROJECT_NAME}_sparse PUBLIC ${PROJECT_NAME}_constants ${PROJECT_NAME}_sorting)
4 changes: 2 additions & 2 deletions src/specialfunctions/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ set(specialfunctions_fppFiles
stdlib_specialfunctions_gamma.fypp
)

configure_stdlib_target(specialfunctions specialfunctions_f90Files specialfunctions_fppFiles "")
configure_stdlib_target(${PROJECT_NAME}_specialfunctions specialfunctions_f90Files specialfunctions_fppFiles "")

target_link_libraries(specialfunctions PUBLIC intrinsics)
target_link_libraries(${PROJECT_NAME}_specialfunctions PUBLIC ${PROJECT_NAME}_intrinsics)
4 changes: 2 additions & 2 deletions src/specialmatrices/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ set(specialmatrices_cppFiles
set(specialmatrices_f90Files
)

configure_stdlib_target(specialmatrices specialmatrices_f90Files specialmatrices_fppFiles specialmatrices_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_specialmatrices specialmatrices_f90Files specialmatrices_fppFiles specialmatrices_cppFiles)

target_link_libraries(specialmatrices PUBLIC constants linalg_core linalg lapack lapack_extended)
target_link_libraries(${PROJECT_NAME}_specialmatrices PUBLIC ${PROJECT_NAME}_constants ${PROJECT_NAME}_linalg_core ${PROJECT_NAME}_linalg ${PROJECT_NAME}_lapack ${PROJECT_NAME}_lapack_extended)
4 changes: 2 additions & 2 deletions src/stats/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ set(stats_fppFiles
set(stats_f90Files
)

configure_stdlib_target(stats stats_f90Files stats_fppFiles stats_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_stats stats_f90Files stats_fppFiles stats_cppFiles)

target_link_libraries(stats PUBLIC core linalg_core linalg selection strings)
target_link_libraries(${PROJECT_NAME}_stats PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_linalg_core ${PROJECT_NAME}_linalg ${PROJECT_NAME}_selection ${PROJECT_NAME}_strings)
4 changes: 2 additions & 2 deletions src/stringlist/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ set(stringlist_f90Files
stdlib_stringlist_type.f90
)

configure_stdlib_target(stringlist stringlist_f90Files stringlist_fppFiles stringlist_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_stringlist stringlist_f90Files stringlist_fppFiles stringlist_cppFiles)

target_link_libraries(stringlist PUBLIC math strings)
target_link_libraries(${PROJECT_NAME}_stringlist PUBLIC ${PROJECT_NAME}_math ${PROJECT_NAME}_strings)
4 changes: 2 additions & 2 deletions src/strings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ set(strings_cppFiles
set(strings_f90Files
)

configure_stdlib_target(strings strings_f90Files strings_fppFiles strings_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_strings strings_f90Files strings_fppFiles strings_cppFiles)

target_link_libraries(strings PUBLIC core)
target_link_libraries(${PROJECT_NAME}_strings PUBLIC ${PROJECT_NAME}_core)
4 changes: 2 additions & 2 deletions src/system/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ set(system_f90Files
stdlib_system.F90
)

configure_stdlib_target(system system_f90Files system_fppFiles system_cppFiles)
configure_stdlib_target(${PROJECT_NAME}_system system_f90Files system_fppFiles system_cppFiles)

target_link_libraries(system PUBLIC core linalg_core strings)
target_link_libraries(${PROJECT_NAME}_system PUBLIC ${PROJECT_NAME}_core ${PROJECT_NAME}_linalg_core ${PROJECT_NAME}_strings)
Loading