From 06443ff4e3b0d0782a23b7d3dead608c9c72df87 Mon Sep 17 00:00:00 2001 From: Sam Nelson Date: Tue, 27 May 2014 15:12:46 -0600 Subject: [PATCH] Moved Fortran compiler check to work with either gcc or clang compilation --- CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ac5faebbb..c67729db3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,6 @@ project(FreeCAD_trunk) set(FREECAD_VERSION "0.13") -# Needed for salomesmesh -if(CMAKE_COMPILER_IS_GNUCXX) -ENABLE_LANGUAGE(Fortran) -endif(CMAKE_COMPILER_IS_GNUCXX) - set(PACKAGE_NAME "FreeCAD") set(PACKAGE_VERSION_MAJOR "0") set(PACKAGE_VERSION_MINOR "12") @@ -50,6 +45,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) + # Needed for salomesmesh + ENABLE_LANGUAGE(Fortran) + include(cMake/ConfigureChecks.cmake) configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) add_definitions(-DHAVE_CONFIG_H)