Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CrysFML
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
CrysFML
Commits
948272d4
Commit
948272d4
authored
Jun 24, 2020
by
Remi Perenon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding HEAP_ARRAYS option and use it for cmake ifort on Windows
parent
9871d079
Pipeline
#7937
passed with stages
in 13 minutes and 53 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
6 deletions
+13
-6
BuildServer/Windows/build.bat
BuildServer/Windows/build.bat
+1
-1
BuildServer/Windows/build_release.bat
BuildServer/Windows/build_release.bat
+1
-1
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/set_compiler_flags.cmake
cmake/set_compiler_flags.cmake
+10
-3
No files found.
BuildServer/Windows/build.bat
View file @
948272d4
...
...
@@ -6,7 +6,7 @@ mkdir build_%compiler%
cd
build_
%compiler%
if
%compiler%
neq
gfortran
(
cmake
-G
"NMake Makefiles"
-D
ARCH32
=
OFF
-D
CMAKE_BUILD_TYPE
=
Debug
-D
CMAKE_Fortran_COMPILER
=
%compiler%
-D
USE_HDF
=
ON
-D
HDF5_INCLUDE_PATH
=
%HDF5
_INCLUDE_PATH
%
-D
HDF5_LIBRARY_PATH
=
%HDF5
_LIBRARY_PATH
%
..
cmake
-G
"NMake Makefiles"
-D
ARCH32
=
OFF
-D
CMAKE_BUILD_TYPE
=
Debug
-D
CMAKE_Fortran_COMPILER
=
%compiler%
-D
HEAP_ARRAYS
=
ON
-D
USE_HDF
=
ON
-D
HDF5_INCLUDE_PATH
=
%HDF5
_INCLUDE_PATH
%
-D
HDF5_LIBRARY_PATH
=
%HDF5
_LIBRARY_PATH
%
..
)
else
(
cmake
-G
"MinGW Makefiles"
-D
ARCH32
=
OFF
-D
CMAKE_BUILD_TYPE
=
Debug
-D
CMAKE_Fortran_COMPILER
=
%compiler%
-D
USE_HDF
=
OFF
-D
HDF5_INCLUDE_PATH
=
%HDF5
_INCLUDE_PATH
%
-D
HDF5_LIBRARY_PATH
=
%HDF5
_LIBRARY_PATH
%
..
)
...
...
BuildServer/Windows/build_release.bat
View file @
948272d4
...
...
@@ -5,6 +5,6 @@ rmdir build_release /s /q
mkdir
build_release
cd
build_release
cmake
-G
"NMake Makefiles"
-D
ARCH32
=
OFF
-D
CMAKE_BUILD_TYPE
=
Release
-D
CMAKE_Fortran_COMPILER
=
ifort
-D
USE_HDF
=
ON
-D
HDF5_INCLUDE_PATH
=
%HDF5
_INCLUDE_PATH
%
-D
HDF5_LIBRARY_PATH
=
%HDF5
_LIBRARY_PATH
%
..
cmake
-G
"NMake Makefiles"
-D
ARCH32
=
OFF
-D
CMAKE_BUILD_TYPE
=
Release
-D
CMAKE_Fortran_COMPILER
=
ifort
-D
HEAP_ARRAYS
=
ON
-D
USE_HDF
=
ON
-D
HDF5_INCLUDE_PATH
=
%HDF5
_INCLUDE_PATH
%
-D
HDF5_LIBRARY_PATH
=
%HDF5
_LIBRARY_PATH
%
..
cmake
-
-build
.
ctest
\ No newline at end of file
CMakeLists.txt
View file @
948272d4
...
...
@@ -10,7 +10,7 @@ option(USE_HDF "Build crysfml and wcrysfml library" OFF)
option
(
GUI
"Build crysfml and wcrysfml library"
OFF
)
option
(
ARCH32
"32 or 64 bit architecture"
ON
)
option
(
CRYSFML08
"Build CrysFML08"
OFF
)
option
(
HEAP_ARRAYS
"Put arrays in heap instead of stack (only for Windows ifort)"
OFF
)
option
(
PROG_EX
"Build the Program Examples"
ON
)
if
(
DEFINED CMAKE_Fortran_COMPILER
)
...
...
cmake/set_compiler_flags.cmake
View file @
948272d4
...
...
@@ -9,14 +9,21 @@ macro(set_compiler_flags)
if
(
WIN32
)
if
(
CMAKE_BUILD_TYPE STREQUAL Debug
)
set
(
CMAKE_Fortran_FLAGS_DEBUG
"/debug:full /traceback /nologo /fpp /Qopt-report=0"
)
# set(CMAKE_Fortran_FLAGS_DEBUG "/debug:full /traceback /nologo")
if
(
HEAP_ARRAYS
)
set
(
CMAKE_Fortran_FLAGS_DEBUG
"/debug:full /traceback /nologo /fpp /Qopt-report=0 /heap-arrays"
)
else
()
set
(
CMAKE_Fortran_FLAGS_DEBUG
"/debug:full /traceback /nologo /fpp /Qopt-report=0"
)
endif
()
set
(
OPT_FLAGS0
"/O0 /check:noarg_temp_created "
)
set
(
OPT_FLAGS
"/Od /check:noarg_temp_created "
)
set
(
OPT_FLAGS1
"/Od /check:noarg_temp_created "
)
set
(
OPT_FLAGS2
"/Od /check:noarg_temp_created "
)
elseif
(
CMAKE_BUILD_TYPE STREQUAL Release
)
set
(
CMAKE_Fortran_FLAGS_RELEASE
"/Qopt-report=0 /nologo"
)
if
(
HEAP_ARRAYS
)
set
(
CMAKE_Fortran_FLAGS_RELEASE
"/Qopt-report=0 /nologo /heap-arrays"
)
else
()
set
(
CMAKE_Fortran_FLAGS_RELEASE
"/Qopt-report=0 /nologo"
)
endif
()
set
(
OPT_FLAGS0
"/O0"
)
set
(
OPT_FLAGS
"/O2 /Qparallel"
)
set
(
OPT_FLAGS1
"/Od"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment