diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dbdada..9db3d47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,14 @@
 ##
 ######################################################################
 
-project(gsCInterface LANGUAGES C)
+project(gsCInterface LANGUAGES CXX)
 
 include(CheckLanguage)
 check_language(Fortran)
 if(CMAKE_Fortran_COMPILER)
   enable_language(Fortran)
+  include(FortranCInterface)
+  FortranCInterface_VERIFY(CXX)
 else()
   message(STATUS "No Fortran support")
 endif()
@@ -17,6 +19,9 @@ endif()
 # Apply G+Smo config
 include(gsConfig)
 
+set(CMAKE_Fortran_FLAGS ${CMAKE_Fortran_FLAGS} "/names:lowercase")
+#set(CMAKE_Fortran_FLAGS ${CMAKE_Fortran_FLAGS} "-names lowercase")
+
 ## Collect files
 aux_header_directory(${CMAKE_CURRENT_SOURCE_DIR}/src ${PROJECT_NAME}_H)
 aux_cpp_directory   (${CMAKE_CURRENT_SOURCE_DIR}/src ${PROJECT_NAME}_CPP)
@@ -37,7 +42,7 @@ add_library(${PROJECT_NAME} OBJECT
 set_target_properties(${PROJECT_NAME} PROPERTIES
   COMPILE_DEFINITIONS gismo_EXPORTS
   POSITION_INDEPENDENT_CODE ON
-  LINKER_LANGUAGE C
+  #LINKER_LANGUAGE C
   FOLDER "G+Smo modules" )
 
 set(gismo_MODULES ${gismo_MODULES} $<TARGET_OBJECTS:${PROJECT_NAME}>