actually needs C90 say for Intel oneAPI

Author: scivision

CMakeLists.txt

@@ -20,7 +20,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND GKlib_IS_TOP_LEVEL)
   set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/local" CACHE PATH "install prefix" FORCE)
 endif()
 
-set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD 90)
 
 message(STATUS "${PROJECT_NAME} ${PROJECT_VERSION} CMake ${CMAKE_VERSION} Arch: ${CMAKE_SYSTEM_PROCESSOR} install prefix: ${CMAKE_INSTALL_PREFIX}")
 

GKlibSystem.cmake

@@ -1,29 +1,27 @@
 # Helper modules.
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-
-# Setup options.
-option(OPENMP "enable OpenMP support" OFF)
-option(PCRE "enable PCRE support" OFF)
-option(GKREGEX "enable GKREGEX support" OFF)
-option(GKRAND "enable GKRAND support" OFF)
-
 
 # Add compiler flags.
 if(MSVC)
   set(GKlib_COPTIONS WIN32 MSC _CRT_SECURE_NO_DEPRECATE USE_GKREGEX)
-elseif(WIN32)
+elseif(MINGW)
   set(GKlib_COPTIONS USE_GKREGEX)
 else()
-  set(GKlib_COPTIONS LINUX FILE_OFFSET_BITS=64)
+  set(GKlib_COPTIONS LINUX _FILE_OFFSET_BITS=64)
 endif(MSVC)
 
 if(CYGWIN)
   list(APPEND GKlib_COPTIONS CYGWIN)
-endif()
+endif(CYGWIN)
 
-if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  list(APPEND GKlib_COPTS -fno-strict-aliasing -Wall -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label)
+if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+# GCC opts.
+  list(APPEND GKlib_COPTS -fno-strict-aliasing)
+
+  # if(VALGRIND)
+  #   list(APPEND GKlib_COPTS -march=x86-64 -mtune=generic)
+  # else()
+  #   list(APPEND GKlib_COPTS -march=native)
+  # endif(VALGRIND)
 endif()
 
 if(UNIX)
@@ -32,63 +30,11 @@ check_pie_supported()
 set(CMAKE_POSITION_INDEPENDENT_CODE true)
 endif()
 
-# Find OpenMP if it is requested.
-if(OPENMP)
-  find_package(OpenMP REQUIRED)
-  list(APPEND GKlib_COPTIONS __OPENMP__)
-endif()
-
 # Set the CPU type
-if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-  list(APPEND GKlib_COPTIONS NO_X86=1)
-endif()
-
-# Add various options
-if(PCRE)
-  list(APPEND GKlib_COPTIONS __WITHPCRE__)
-endif()
-
-if(GKREGEX)
-list(APPEND GKlib_COPTIONS USE_GKREGEX)
-endif()
-
-if(GKRAND)
-list(APPEND GKlib_COPTIONS USE_GKRAND)
-endif()
-
-
-# Check for features.
-check_include_file(execinfo.h HAVE_EXECINFO_H)
-if(HAVE_EXECINFO_H)
-  list(APPEND GKlib_COPTIONS HAVE_EXECINFO_H)
-endif(HAVE_EXECINFO_H)
+if(NO_X86)
+  list(APPEND GKlib_COPTS -DNO_X86=${NO_X86})
+endif(NO_X86)
 
-check_function_exists(getline HAVE_GETLINE)
-if(HAVE_GETLINE)
- list(APPEND GKlib_COPTIONS HAVE_GETLINE)
-endif(HAVE_GETLINE)
-
-
-# Custom check for TLS.
-if(MSVC)
- list(APPEND GKlib_COPTIONS __thread=__declspec(thread))
-
-  # This if checks if that value is cached or not.
-  if("${HAVE_THREADLOCALSTORAGE}" MATCHES "^${HAVE_THREADLOCALSTORAGE}$")
-    message(CHECK_START "checking for thread-local storage")
-    try_compile(HAVE_THREADLOCALSTORAGE
-      ${CMAKE_BINARY_DIR}
-      ${GKLIB_PATH}/conf/check_thread_storage.c)
-    if(HAVE_THREADLOCALSTORAGE)
-      message(CHECK_PASS "found")
-    else()
-      message(CHECK_FAIL "not found")
-    endif()
-  endif()
-  if(NOT HAVE_THREADLOCALSTORAGE)
-    list(APPEND GKlib_COPTIONS __thread=)
-  endif()
-endif()
 
 # Finally set the official C flags.
 add_compile_options("$<$<COMPILE_LANGUAGE:C>:${GKlib_COPTS}>")