Skip to content

Commit 3c64710

Browse files
committed
cleaned up library linking
1 parent 553e716 commit 3c64710

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,34 +161,27 @@ function(set_finufft_options target)
161161
set(FFTW_INCLUDE_DIR ${FFTW_SOURCE_DIR}/api)
162162
target_include_directories(${target} PUBLIC ${FFTW_INCLUDE_DIR})
163163
endif ()
164-
165-
# XSIMD is a header only library, so we just need to include the headers
166-
target_include_directories(${target} PUBLIC ${XSIMD_INCLUDE_DIR})
164+
target_link_libraries(${target} PRIVATE xsimd)
165+
target_link_libraries(${target} PRIVATE ${FINUFFT_FFTW_LIBRARIES})
167166
endfunction()
168167

169168
if (FINUFFT_USE_CPU)
170169
# Main finufft libraries
171170
add_library(finufft_f32 OBJECT ${FINUFFT_PRECISION_DEPENDENT_SOURCES})
172171
target_compile_definitions(finufft_f32 PRIVATE SINGLE)
173172
set_finufft_options(finufft_f32)
174-
target_link_libraries(finufft_f32 PUBLIC ${FINUFFT_FFTW_LIBRARIES})
175-
target_link_libraries(finufft_f32 PRIVATE xsimd)
176173

177174
add_library(finufft_f64 OBJECT ${FINUFFT_PRECISION_DEPENDENT_SOURCES})
178175
target_compile_definitions(finufft_f64 PRIVATE)
179176
set_finufft_options(finufft_f64)
180-
target_link_libraries(finufft_f64 PUBLIC ${FINUFFT_FFTW_LIBRARIES})
181-
target_link_libraries(finufft_f64 PRIVATE xsimd)
182177
if (WIN32)
183178
add_library(finufft_f32_dll OBJECT ${FINUFFT_PRECISION_DEPENDENT_SOURCES})
184179
target_compile_definitions(finufft_f32_dll PRIVATE SINGLE dll_EXPORTS FINUFFT_DLL)
185180
set_finufft_options(finufft_f32_dll)
186-
target_link_libraries(finufft_f32_dll PUBLIC ${FINUFFT_FFTW_LIBRARIES})
187181

188182
add_library(finufft_f64_dll OBJECT ${FINUFFT_PRECISION_DEPENDENT_SOURCES})
189183
target_compile_definitions(finufft_f64_dll PRIVATE dll_EXPORTS FINUFFT_DLL)
190184
set_finufft_options(finufft_f64_dll)
191-
target_link_libraries(finufft_f64_dll PUBLIC ${FINUFFT_FFTW_LIBRARIES})
192185
endif ()
193186

194187
add_library(finufft SHARED src/utils_precindep.cpp contrib/legendre_rule_fast.cpp)

cmake/setupXSIMD.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@ CPMAddPackage(
1818
"XSIMD_ENABLE_XTL_COMPLEX YES"
1919
)
2020

21-
get_property(XSIMD_SOURCE_DIR TARGET xsimd PROPERTY SOURCE_DIR)
22-
set(XSIMD_INCLUDE_DIR ${XSIMD_SOURCE_DIR}/include)

0 commit comments

Comments
 (0)