The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit 647ec3c2 authored by juan rodriguez-carvajal's avatar juan rodriguez-carvajal
Browse files

Correcting a problem in set_compiler_flags.cmake and crysfml_common.cmake

parent dc5abf95
......@@ -89,8 +89,8 @@ set(CRYSFML_COMMON_SOURCES
set_source_files_properties(${CRYSFML_COMMON_SOURCES} PROPERTIES COMPILE_FLAGS ${OPT_FLAGS})
# Those files need specific optimization flags.
set_source_files_properties(CFML_BVSpar.f90 CFML_Bond_Table.f90 CFML_Scattering_Chemical_Tables.f90 CFML_Symmetry_Tables.f90 PROPERTIES COMPILE_FLAGS ${OPT_FLAGS0})
set_source_files_properties(CFML_Profile_TOF.f90 PROPERTIES COMPILE_FLAGS ${OPT_FLAGS1})
set_source_files_properties(CFML_BVSpar.f90 CFML_Bond_Tables.f90 CFML_Scattering_Chemical_Tables.f90 CFML_Symmetry_Tables.f90 PROPERTIES COMPILE_FLAGS ${OPT_FLAGS0})
set_source_files_properties(CFML_PowderProfiles_TOF.f90 PROPERTIES COMPILE_FLAGS ${OPT_FLAGS2})
#################################
# Build section
......
......@@ -23,20 +23,20 @@ macro(set_compiler_flags)
set(CMAKE_Fortran_FLAGS_RELEASE "/Qopt-report=0 /nologo /heap-arrays")
else()
set(CMAKE_Fortran_FLAGS_RELEASE "/Qopt-report=0 /nologo")
endif()
if (QPARALLEL)
set(OPT_FLAGS0 "/Od")
set(OPT_FLAGS "/O2 /Qparallel")
set(OPT_FLAGS1 "/Od")
set(OPT_FLAGS2 "/O1 /Qparallel")
set(OPT_FLAGS3 "/O3 /Qparallel")
else()
set(OPT_FLAGS0 "/Od")
set(OPT_FLAGS "/O2")
set(OPT_FLAGS1 "/Od")
set(OPT_FLAGS2 "/O1")
set(OPT_FLAGS3 "/O3")
endif()
endif()
if (QPARALLEL)
set(OPT_FLAGS0 "/Od")
set(OPT_FLAGS "/O2 /Qparallel")
set(OPT_FLAGS1 "/Od")
set(OPT_FLAGS2 "/O1 /Qparallel")
set(OPT_FLAGS3 "/O3 /Qparallel")
else()
set(OPT_FLAGS0 "/Od")
set(OPT_FLAGS "/O2")
set(OPT_FLAGS1 "/Od")
set(OPT_FLAGS2 "/O1")
set(OPT_FLAGS3 "/O3")
endif()
endif()
elseif(APPLE)
if(CMAKE_BUILD_TYPE STREQUAL Debug)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment