-
Notifications
You must be signed in to change notification settings - Fork 101
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Wrong FFTS include path #230
Comments
We've had issues where on Windows, the opposite is true: ffts.h fails to compile and ffts/ffts.h works. Maybe FindFFTS.cmake needs porting work to find the library on Windows? |
(paging @nshcat to look into this) |
ATM some source file use
So if those build the issue with windows should be elsewhere. As mentionned I had to update the apps CMakelist.txt because the includes in headers will will leak there. --- a/src/glscopeclient/CMakeLists.txt
+++ b/src/glscopeclient/CMakeLists.txt
@@ -11,7 +11,7 @@ if(WIN32)
endif()
#Set up include paths
-include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS})
+include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS} ${LIBFFTS_INCLUDE_DIR})
link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
############################################################################### |
Actually a better solution is to set the FFTS include dir in the diff --git a/scopeprotocols/CMakeLists.txt b/scopeprotocols/CMakeLists.txt
index e604b34..4c637f3 100644
--- a/scopeprotocols/CMakeLists.txt
+++ b/scopeprotocols/CMakeLists.txt
@@ -86,6 +86,6 @@ target_link_libraries(scopeprotocols
target_include_directories(scopeprotocols
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
-PRIVATE ${LIBFFTS_INCLUDE_DIR})
+ ${LIBFFTS_INCLUDE_DIR})
install(TARGETS scopeprotocols LIBRARY DESTINATION /usr/lib) |
I'm in the middle of a major refactoring right now. Send a PR in a day or so when I'm done? I don't want you to have to put too much effort into merging/rebasing. |
Done with the refactoring if you want to look at this. Some of the FFTS includes may have got twiddled as part of this, so probably best to go check everywhere. |
From how FindFFTS.cmake works, LIBFFTS_INCLUDE_DIR will already include the ffts/ component. Fixes ngscopeclient#230 Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
DeEmbedDecoder.h
andFFTDecoder.h
use#include <ffts/ffts.h>
instead of#include <ffts.h>
.Some other places do it correctly and if you look at how
FindFFTS.cmake
works,LIBFFTS_INCLUDE_DIR
will already include theffts/
component.But since
glscopeclient
includes something that includes those, you also need to simultaneously addLIBFFTS_INCLUDE_DIR
to theinclude_directories
of that application.The text was updated successfully, but these errors were encountered: