diff --git a/CMake/variants/variants.lhd002 b/CMake/variants/variants.lhd001 similarity index 54% rename from CMake/variants/variants.lhd002 rename to CMake/variants/variants.lhd001 index 249fcc768bfe2811e42533dd902f1064310da1ef..564d0004991312bb584cd2536ecfaee9896f8c57 100644 --- a/CMake/variants/variants.lhd002 +++ b/CMake/variants/variants.lhd001 @@ -1,15 +1,11 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON) -set(CASACORE_ROOT_DIR /opt/cep/casacore/current) -set(CASAREST_ROOT_DIR /opt/cep/casarest/current) -set(PYRAP_ROOT_DIR /opt/cep/pyrap/current) -set(WCSLIB_ROOT_DIR /opt/cep/lofar/external/wcslib) +set(CASACORE_ROOT_DIR /opt/cep/casacore/casacore_current) +set(CASAREST_ROOT_DIR /opt/cep/casacore/casarest_current) +set(PYRAP_ROOT_DIR /opt/cep/casacore/python-casacore_current) set(AOFLAGGER_ROOT_DIR /opt/cep/aoflagger/current) set(BDSF_ROOT_DIR /opt/cep/pybdsf/current) set(DAL_ROOT_DIR /opt/cep/dal/current) -set(QPID_ROOT_DIR /opt/qpid) -set(LOG4CXX_ROOT_DIR /opt/cep/lofar/external/log4cxx) -set(LOG4CPLUS_ROOT_DIR /opt/cep/lofar/external/log4cplus) set(ENV{HDF5_ROOT} ) set(CTEST_CUSTOM_WARNING_EXCEPTION