diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake --- a/cmake/FindJulia.cmake +++ b/cmake/FindJulia.cmake @@ -46,6 +46,7 @@ # 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 diff --git a/src/backends/julia/CMakeLists.txt b/src/backends/julia/CMakeLists.txt --- a/src/backends/julia/CMakeLists.txt +++ b/src/backends/julia/CMakeLists.txt @@ -1,3 +1,5 @@ +include_directories(${Julia_INCLUDE_DIRS}) + add_subdirectory(juliaserver) add_subdirectory(tests) @@ -16,7 +18,7 @@ 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) diff --git a/src/backends/julia/juliaserver/CMakeLists.txt b/src/backends/julia/juliaserver/CMakeLists.txt --- a/src/backends/julia/juliaserver/CMakeLists.txt +++ b/src/backends/julia/juliaserver/CMakeLists.txt @@ -1,12 +1,13 @@ +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 )