Skip to content

Commit 723d01d

Browse files
committed
Fix compatibilities with vcpkg
1 parent 22425cb commit 723d01d

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

cmake/FindFFTW.cmake

-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# FFTW_INCLUDES ... fftw include directory
1010
#
1111
# The following variables will be checked by the function
12-
# FFTW_USE_STATIC_LIBS ... if true, only static libraries are found
1312
# FFTW_ROOT ... if set, the libraries are exclusively searched
1413
# under this path
1514
# FFTW_LIBRARY ... fftw library to use
@@ -29,15 +28,6 @@ if( PKG_CONFIG_FOUND AND NOT FFTW_ROOT )
2928
pkg_check_modules( PKG_FFTW QUIET "fftw3" )
3029
endif()
3130

32-
#Check whether to search static or dynamic libs
33-
set( CMAKE_FIND_LIBRARY_SUFFIXES_SAV ${CMAKE_FIND_LIBRARY_SUFFIXES} )
34-
35-
if( ${FFTW_USE_STATIC_LIBS} )
36-
set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX} )
37-
else()
38-
set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX} )
39-
endif()
40-
4131
if( FFTW_ROOT )
4232

4333
#find libs
@@ -109,8 +99,6 @@ if(FFTWL_LIB)
10999
set(FFTW_LIBRARIES ${FFTW_LIBRARIES} ${FFTWL_LIB})
110100
endif()
111101

112-
set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SAV} )
113-
114102
include(FindPackageHandleStandardArgs)
115103
find_package_handle_standard_args(FFTW DEFAULT_MSG
116104
FFTW_INCLUDES FFTW_LIBRARIES)

cmake/FindHunspell.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR NAMES hunspell.h
2626
PATH_SUFFIXES hunspell
2727
)
2828

29-
FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell ${HUNSPELL_PKG_LIBRARIES}
29+
find_library(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell libhunspell ${HUNSPELL_PKG_LIBRARIES}
3030
PATHS
3131
/usr/local
3232
/usr

0 commit comments

Comments
 (0)