Commit 3ef0e7ba authored by Tomaz  Canabrava's avatar Tomaz Canabrava

Julia compilation fixes

Summary:
While compilling master, a few failures regarding julia where raised
on my computer:

Scanning dependencies of target cantor_juliaserver
[ 16%] Building CXX object
src/backends/julia/juliaserver/CMakeFiles/cantor_juliaserver.dir/juliaserver.cpp.o
In file included from
/home/tcanabrava/Projects/kdesrc/cantor/src/backends/julia/juliaserver/juliaserver.cpp:22:0:
/usr/include/julia/julia.h:59:27: fatal error: julia_threads.h: No such
file or directory
 #include <julia_threads.h>
                            ^
                            compilation terminated.

Inspecting the FindJulia that's shipped with Cantor, the issue seemed
obvious to me: it doesn't tries to find LibJulia, nor it does add
the julia includes to the include_directories.
Signed-off-by: Tomaz  Canabrava's avatarTomaz Canabrava <tcanabrava@kde.org>

Differential Revision: https://phabricator.kde.org/D3070
parent 6205ab58
......@@ -46,6 +46,7 @@ endif()
# Checking existance of main header. Some distos provide packages without actual includes
find_path(Julia_MAIN_HEADER julia.h HINTS ${Julia_INCLUDE_DIRS})
find_library(Julia_LIBRARY julia HINTS ${Julia_INCLUDE_DIRS}/../../lib)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Julia
......
include_directories(${Julia_INCLUDE_DIRS})
add_subdirectory(juliaserver)
add_subdirectory(tests)
......@@ -16,7 +18,7 @@ ki18n_wrap_ui(JuliaBackend_SRCS settings.ui)
add_backend(juliabackend ${JuliaBackend_SRCS})
target_link_libraries(cantor_juliabackend Qt5::DBus)
target_link_libraries(cantor_juliabackend Qt5::DBus ${Julia_LIBRARY})
install(FILES juliabackend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES keywords.xml DESTINATION ${KDE_INSTALL_DATADIR}/cantor/juliabackend)
......
add_definitions(-DJULIA_ENABLE_THREADING=1)
set(JuliaServer_SRCS
juliaserver.cpp
main.cpp
)
add_executable(cantor_juliaserver ${JuliaServer_SRCS})
target_link_libraries(cantor_juliaserver
${JULIA_LIBRARY}
${Julia_LIBRARY}
Qt5::Widgets
Qt5::DBus
)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment