diff --git a/cmake/toolchain/heptools-experimental.cmake b/cmake/toolchain/heptools-experimental.cmake
index 68eb7c6652395265858d95dfc0d1a4ebea7c0330..b09449a7105490294fedc26c19e6704527a626cd 100644
--- a/cmake/toolchain/heptools-experimental.cmake
+++ b/cmake/toolchain/heptools-experimental.cmake
@@ -63,7 +63,7 @@ LCG_external_package(elasticsearch 2.3.0
LCG_external_package(entrypoints 0.2.2 )
LCG_external_package(fastjet 3.2.0 )
LCG_external_package(fjcontrib 1.022 )
-LCG_external_package(fftw 3.1.2 fftw3 )
+LCG_external_package(fftw 3.3.4 fftw3 )
LCG_external_package(freetype 2.6.3 )
LCG_external_package(Frontier_Client 2.8.19 frontier_client)
LCG_external_package(ftjam 2.5.2 )
@@ -79,6 +79,7 @@ LCG_external_package(GSL 2.1
LCG_external_package(hepdata_converter 0.1.23 )
LCG_external_package(hepdata_validator 0.1.8 )
LCG_external_package(HepPDT 2.06.01 )
+LCG_external_package(ijulia 1.1.10 )
LCG_external_package(ipython 5.0.0 )
LCG_external_package(ipython_genutils 0.1.0 )
LCG_external_package(ipykernel 4.3.1 )
@@ -91,6 +92,7 @@ LCG_external_package(Jinja2 2.7.3
LCG_external_package(jpype 0.6.1 )
LCG_external_package(json 2.5.2 )
LCG_external_package(jsonschema 2.4.0 )
+LCG_external_package(julia 0.4.6 )
LCG_external_package(jupyter 1.0.0 )
LCG_external_package(jupyter_client 4.3.0 )
LCG_external_package(jupyter_core 4.1.0 )
diff --git a/documentation/packageinfo.txt b/documentation/packageinfo.txt
index faf09a2966640b671b5b57a12f2e643741e82185..57a40b8343c187667f750abe8dc76a013779343c 100644
--- a/documentation/packageinfo.txt
+++ b/documentation/packageinfo.txt
@@ -2859,5 +2859,27 @@
"category" : "Generator",
"language" : "C++",
"license" : "UNKNOWN",
+ },
+ {
+ "name" : "julia",
+ "fullname" : "Julia",
+ "description" : "High-level, high-performance dynamic programming language for technical computing",
+ "homepage" : "http://julialang.org",
+ "contact" : "Pere Mato pere.mato@cern.ch",
+ "project" : "None",
+ "category" : "Language",
+ "language" : "Julia",
+ "license" : "MIT",
+ },
+ {
+ "name" : "ijulia",
+ "fullname" : "IJulia",
+ "description" : "Julia kernel and magics for Jupyter",
+ "homepage" : "https://github.com/JuliaLang/IJulia.jl",
+ "contact" : "Pere Mato pere.mato@cern.ch",
+ "project" : "None",
+ "category" : "Tool",
+ "language" : "Julia",
+ "license" : "MIT",
}
]
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 5e1ceefa79d96ab21f8d4e98aef81e4a034dd357..92e3d2bc8b8be35eecb33dda85625647de514f7e 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1016,7 +1016,7 @@ LCGPackage_Add(
LCGPackage_Add(
fftw
URL ${GenURL}/fftw-${fftw_native_version}.tar.gz
- CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-shared
+ CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-shared --enable-threads
BUILD_COMMAND make CFLAGS=-fPIC
BUILD_IN_SOURCE 1
)
@@ -1296,6 +1296,41 @@ LCGPackage_Add(
DEPENDS autoconf
)
+#----julia------------------------------------------------------------------------------
+string(REGEX MATCH "[0-9]+\\.[0-9]+" julia_version_twodigit ${julia_native_version})
+LCGPackage_Add(
+ julia
+ URL ${GenURL}/julia-${julia_native_version}.tar.gz
+ ENVIRONMENT ${library_path}=${fftw_home}/lib:\$ENV{${library_path}}
+ CONFIGURE_COMMAND <VOID>
+ BUILD_COMMAND <VOID>
+ INSTALL_COMMAND ${MAKE} install prefix=<INSTALL_DIR>
+ USE_SYSTEM_FFTW=1
+ BUILD_IN_SOURCE 1
+ DEPENDS fftw
+)
+
+#----ijulia------------------------------------------------------------------------------
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/commands.jl "
+ Pkg.init()
+ Pkg.add(\"IJulia\")
+")
+LCGPackage_Add(
+ ijulia
+ DOWNLOAD_COMMAND <VOID>
+ #URL ${GenURL}/ijulia-${ijulia_native_version}.tar.gz
+ ENVIRONMENT JULIA_PKGDIR=<INSTALL_DIR>/share/julia/site
+ CONFIGURE_COMMAND <VOID>
+ BUILD_COMMAND <VOID>
+ INSTALL_COMMAND julia ${CMAKE_CURRENT_BINARY_DIR}/commands.jl
+ COMMAND ${CMAKE_COMMAND} -E remove <INSTALL_DIR>/share/julia/site/v${julia_version_twodigit}/.cache
+ COMMAND ${CMAKE_COMMAND} -E remove_directory <INSTALL_DIR>/share/julia/site/.cache
+ COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/share/julia/site/v0.4/IJulia/deps/julia-${julia_version_twodigit}
+ <INSTALL_DIR>/share/jupyter/kernels
+ BUILD_IN_SOURCE 1
+ DEPENDS julia
+)
+
foreach(v ${yamlcpp_native_version})
LCG_add_test(yamlcpp-${v}.build
BINARY_DIR yamlcpp/tests/${v}