Task #7427

New version was accidently committed.
However, it is the question why it fails on LCU, but is fine on CEP2/3.

CMake/FindCasacore.cmake

@@ -182,10 +182,11 @@ set(CASACORE_DEFINITIONS)
 set(CASACORE_LIBRARIES)
 set(CASACORE_MISSING_COMPONENTS)
 
-# Search for the header file first.
+# Search for the header file first. Note that casacore installs the header
+# files in ${prefix}/include/casacore, instead of ${prefix}/include.
 if(NOT CASACORE_INCLUDE_DIR)
-  find_path(CASACORE_INCLUDE_DIR casacore/casa/aips.h
-    HINTS ${CASACORE_ROOT_DIR} PATH_SUFFIXES include)
+  find_path(CASACORE_INCLUDE_DIR casa/aips.h
+    HINTS ${CASACORE_ROOT_DIR} PATH_SUFFIXES include/casacore)
   mark_as_advanced(CASACORE_INCLUDE_DIR)
 endif(NOT CASACORE_INCLUDE_DIR)
 
@@ -194,9 +195,7 @@ if(NOT CASACORE_INCLUDE_DIR)
 else(NOT CASACORE_INCLUDE_DIR)
   # We've found the header file; let's continue.
   set(CASACORE_FOUND TRUE)
-  # Note that new Casacore uses #include<casacore/casa/...>, while
-  # LOFAR still uses #include<casa/...>. Hence use both in -I path.
-  set(CASACORE_INCLUDE_DIRS ${CASACORE_INCLUDE_DIR} ${CASACORE_INCLUDE_DIR}/casacore)
+  set(CASACORE_INCLUDE_DIRS ${CASACORE_INCLUDE_DIR})
 
   # Search for some often used binaries.
   find_program(TAQL_EXECUTABLE taql