Update for Fortran-C interface.

xiaoyeli · Nov 12, 2019 · a9cb578 · a9cb578
1 parent fdea657
commit a9cb578
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ option(TPL_COMBBLAS_INCLUDE_DIRS "List of absolute paths to CombBLAS include dir
 #
 # IDEAS: xSDK standards module
 MESSAGE("\nProcess XSDK defaults ...")
-# SET(USE_XSDK_DEFAULTS_DEFAULT TRUE) # Set to false if desired
+SET(USE_XSDK_DEFAULTS_DEFAULT TRUE) # Set to false if desired
 INCLUDE("cmake/XSDKDefaults.cmake")
 INCLUDE(CTest)
 ######################################################################
@@ -87,6 +87,7 @@ endif()
 set(CMAKE_CXX_STANDARD 11)
 
 if (XSDK_ENABLE_Fortran)
+   message("+++ XSDK fortran enabled")
   enable_language (Fortran)
   set(NOFORTRAN FALSE)
 endif()
@@ -296,7 +297,7 @@ endif()
 
 ######################################################################
 #
-# Fortran - C name mangling 
+# Fortran-C name mangling 
 #
 ######################################################################
 include(FortranCInterface)

diff --git a/cmake/XSDKDefaults.cmake b/cmake/XSDKDefaults.cmake
@@ -98,9 +98,9 @@ SET(USE_XSDK_DEFAULTS  ${USE_XSDK_DEFAULTS_DEFAULT}  CACHE  BOOL
   "Use XSDK defaults and behavior.")
 PRINT_VAR(USE_XSDK_DEFAULTS)
 
-SET_DEFAULT(XSDK_ENABLE_C  TRUE)
-SET_DEFAULT(XSDK_ENABLE_CXX  TRUE)
-SET_DEFAULT(XSDK_ENABLE_Fortran  TRUE)
+SET(XSDK_ENABLE_C  TRUE)
+SET(XSDK_ENABLE_CXX  TRUE)
+SET(XSDK_ENABLE_Fortran  TRUE)
 
 # Handle the compiler and flags for a language
 MACRO(XSDK_HANDLE_LANG_DEFAULTS  CMAKE_LANG_NAME  ENV_LANG_NAME