diff --git a/k4Gen/CMakeLists.txt b/k4Gen/CMakeLists.txt index 80f9c14..1a7ae82 100644 --- a/k4Gen/CMakeLists.txt +++ b/k4Gen/CMakeLists.txt @@ -35,17 +35,10 @@ install(TARGETS k4Gen include(CTest) -#--- The genConf directory has been renamed to genConfDir in Gaudi 35r1 -#--- See https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1158 -set(GAUDI_GENCONF_DIR "genConfDir") -if (${Gaudi_VERSION} VERSION_LESS 35.1) - set(GAUDI_GENCONF_DIR "genConf") -endif() - function(set_test_env _testname) set_property(TEST ${_testname} APPEND PROPERTY ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}:$:$:$:$:$:$ENV{LD_LIBRARY_PATH} - PYTHONPATH=${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}/${GAUDI_GENCONF_DIR}:$/../python:$ENV{PYTHONPATH} + PYTHONPATH=${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}/genConfDir:$/../python:$ENV{PYTHONPATH} PATH=$/../bin:$ENV{PATH} K4GEN=${CMAKE_CURRENT_LIST_DIR}/data )