#178 ensure c language is enabled for dependency checks

Author: fbergmann

CMakeModules/FindCHECK.cmake

@@ -82,6 +82,8 @@ unset(CHECK_CHECK_TEST2 CACHE)
 
 set(CHECK_CHECK_TEST)
 set(CMAKE_REQUIRED_LIBRARIES "-lcheck -lm ${EXTRA_LIBS}")
+enable_language(C)
+
 CHECK_C_SOURCE_COMPILES("${CHECK_CHECK_CODE}" CHECK_CHECK_TEST)
 
 if (NOT CHECK_CHECK_TEST)

CMakeModules/FindEXPAT.cmake

@@ -34,6 +34,7 @@ find_path(EXPAT_INCLUDE_DIR expat.h
     PATHS $ENV{EXPAT_DIR}/include
             $ENV{EXPAT_DIR}
             ${${_PROJECT_DEPENDENCY_DIR}}/include
+            CMAKE_FIND_ROOT_PATH_BOTH
             NO_DEFAULT_PATH)
 
 if (NOT EXPAT_INCLUDE_DIR)
@@ -48,13 +49,12 @@ find_path(EXPAT_INCLUDE_DIR expat.h
           /opt/csw/include   # Blastwave
           /opt/include
           /usr/freeware/include
-          NO_DEFAULT_PATH
-          CMAKE_FIND_ROOT_PATH_BOTH)
+          CMAKE_FIND_ROOT_PATH_BOTH
+          NO_DEFAULT_PATH)
 endif ()
 
 if (NOT EXPAT_INCLUDE_DIR)
-    find_path(EXPAT_INCLUDE_DIR expat.h
-    CMAKE_FIND_ROOT_PATH_BOTH)
+    find_path(EXPAT_INCLUDE_DIR expat.h)
 endif ()
 
 find_library(EXPAT_LIBRARY 
@@ -66,6 +66,7 @@ find_library(EXPAT_LIBRARY
           ${${_PROJECT_DEPENDENCY_DIR}}/lib64
           ${${_PROJECT_DEPENDENCY_DIR}}/lib
           ${${_PROJECT_DEPENDENCY_DIR}}
+          CMAKE_FIND_ROOT_PATH_BOTH
           NO_DEFAULT_PATH)
 
 if (NOT EXPAT_LIBRARY)
@@ -83,13 +84,12 @@ find_library(EXPAT_LIBRARY
           /opt/csw/lib   # Blastwave
           /opt/lib
           /usr/freeware/lib64
-          NO_DEFAULT_PATH
-          CMAKE_FIND_ROOT_PATH_BOTH)
+          CMAKE_FIND_ROOT_PATH_BOTH
+          NO_DEFAULT_PATH)
 endif()
 
 if (NOT EXPAT_LIBRARY)
-    find_library(EXPAT_LIBRARY NAMES libexpat expat
-    CMAKE_FIND_ROOT_PATH_BOTH )
+    find_library(EXPAT_LIBRARY NAMES libexpat expat)
 endif ()
 
 mark_as_advanced(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
@@ -138,7 +138,7 @@ if (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
 int 
 main(void)
 {
-    printf(XML_ExpatVersion());
+    printf(\"%s\", XML_ExpatVersion());
     return 0;
 }
 " 

CMakeModules/FindLIBXML.cmake

@@ -112,6 +112,8 @@ unset(LIBXML_LIBXML_TEST2)
 set(LIBXML_LIBXML_TEST)
 set(CMAKE_REQUIRED_LIBRARIES "${LIBXML_LIBRARY};${ADDITIONAL_LIBS}")
 set(CMAKE_REQUIRED_INCLUDES "${LIBXML_INCLUDE_DIR}")
+enable_language(C)
+
 CHECK_C_SOURCE_COMPILES("${LIBXML_LIBXML_CODE}" LIBXML_LIBXML_TEST)