fix inclusion of disable_expandvars.py

Phys/FunctorCache/CMakeLists.txt

@@ -59,8 +59,9 @@ if(THOR_BUILD_TEST_FUNCTOR_CACHE)
     thor_functor_cache(functor_datahandle_test
       OPTIONS
         ${PROJECT_SOURCE_DIR}/Phys/FunctorCore/tests/options/functor_datahandle_test.py
-        ${PROJECT_SOURCE_DIR}/Phys/FunctorCache/options/SilenceErrors.py
-        ${PROJECT_SOURCE_DIR}/Phys/FunctorCache/options/SuppressLogMessages.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/options/SilenceErrors.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/options/SuppressLogMessages.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/options/disable_expandvars.py
       DEPENDS
         ${cache_deps}
       )

Phys/FunctorCache/cmake/ThOrFunctorCache.cmake

@@ -27,9 +27,6 @@
 #]========================================================================]
 function(thor_functor_cache cache_name)
 
-  # Workaround for gaudi/Gaudi#117
-  set(DISABLE_EXPANDVARS_OPTS ${CMAKE_CURRENT_SOURCE_DIR}/options/disable_expandvars.py)
-
   set(CACHE_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 
   CMAKE_PARSE_ARGUMENTS(ARG "" "" "OPTIONS;DEPENDS" ${ARGN})
@@ -48,7 +45,7 @@ function(thor_functor_cache cache_name)
     # make sure that the intall directory already exists otherwise the
     # compilation job will fail!
     COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
-    COMMAND ${CMAKE_BINARY_DIR}/run env FUNCTOR_JIT_LIBDIR=${CACHE_LIB_DIR} gaudirun.py ${DISABLE_EXPANDVARS_OPTS} ${ARG_OPTIONS}
+    COMMAND ${CMAKE_BINARY_DIR}/run env FUNCTOR_JIT_LIBDIR=${CACHE_LIB_DIR} gaudirun.py ${ARG_OPTIONS}
     # This file is only created as dependency proxy as we don't know the output
     # file name the JIT library
     COMMAND touch ${cache_name}.stamp