AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add support for CFLAGS and CXXFLAGS; fixes #1

Browse Source
This commit is contained in:
Radovan Bast 2015-06-10 15:25:24 +02:00
parent eeaceefca5
commit a21201b1b9
17 changed files with 143 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compilers/Clang.C.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CFLAGS})
if(CMAKE_C_COMPILER_ID MATCHES Clang) if(CMAKE_C_COMPILER_ID MATCHES Clang)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS_RELEASE "-O3 -Wno-unused") set(CMAKE_C_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g") set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
endif() endif()
endif()

8
compilers/Clang.CXX.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CXXFLAGS})
if(CMAKE_CXX_COMPILER_ID MATCHES Clang) if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -march=native -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -g") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
endif()
endif() endif()

4
compilers/GNU.C.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CFLAGS})
if(CMAKE_C_COMPILER_ID MATCHES GNU) if(CMAKE_C_COMPILER_ID MATCHES GNU)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS_RELEASE "-O3 -Wno-unused") set(CMAKE_C_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g") set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
endif() endif()
endif()

8
compilers/GNU.CXX.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CXXFLAGS})
if(CMAKE_CXX_COMPILER_ID MATCHES GNU) if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -march=native -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -g") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
endif()
endif() endif()

2
compilers/GNU.Fortran.cmake
View File

@ -1,7 +1,7 @@
if(NOT DEFINED ENV{FCFLAGS}) if(NOT DEFINED ENV{FCFLAGS})
if(CMAKE_Fortran_COMPILER_ID MATCHES GNU) if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -funroll-all-loops -w") set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -funroll-all-loops")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fbacktrace") set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fbacktrace")
endif() endif()
endif() endif()

2
compilers/Intel.C.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CFLAGS})
if(CMAKE_C_COMPILER_ID MATCHES Intel) if(CMAKE_C_COMPILER_ID MATCHES Intel)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS_RELEASE "-O3") set(CMAKE_C_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g") set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
endif() endif()
endif()

8
compilers/Intel.CXX.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CXXFLAGS})
if(CMAKE_CXX_COMPILER_ID MATCHES Intel) if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O3")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -debug -DDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
endif()
endif() endif()

2
compilers/Intel.Fortran.cmake
View File

@ -1,6 +1,6 @@
if(NOT DEFINED ENV{FCFLAGS}) if(NOT DEFINED ENV{FCFLAGS})
if(CMAKE_Fortran_COMPILER_ID MATCHES Intel) if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w -assume byterecl") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -ip") set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -ip")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -traceback") set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -traceback")
endif() endif()

2
compilers/PGI.C.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CFLAGS})
if(CMAKE_C_COMPILER_ID MATCHES PGI) if(CMAKE_C_COMPILER_ID MATCHES PGI)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS_RELEASE "-O3") set(CMAKE_C_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g") set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
endif() endif()
endif()

2
compilers/PGI.CXX.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CXXFLAGS})
if(CMAKE_CXX_COMPILER_ID MATCHES PGI) if(CMAKE_CXX_COMPILER_ID MATCHES PGI)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE "-O3") set(CMAKE_CXX_FLAGS_RELEASE "-O3")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
endif() endif()
endif()

4
compilers/XL.C.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CFLAGS})
if(CMAKE_C_COMPILER_ID MATCHES XL) if(CMAKE_C_COMPILER_ID MATCHES XL)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qcpluscmt") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qcpluscmt")
set(CMAKE_C_FLAGS_RELEASE "-O3") set(CMAKE_C_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_DEBUG "-O0") set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
endif()
endif() endif()

2
compilers/XL.CXX.cmake
View File

@ -1,5 +1,7 @@
if(NOT DEFINED ENV{CXXFLAGS})
if(CMAKE_CXX_COMPILER_ID MATCHES XL) if(CMAKE_CXX_COMPILER_ID MATCHES XL)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE "-O3") set(CMAKE_CXX_FLAGS_RELEASE "-O3")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
endif() endif()
endif()

2
compilers/XL.Fortran.cmake
View File

@ -1,6 +1,6 @@
if(NOT DEFINED ENV{FCFLAGS}) if(NOT DEFINED ENV{FCFLAGS})
if(CMAKE_Fortran_COMPILER_ID MATCHES XL) if(CMAKE_Fortran_COMPILER_ID MATCHES XL)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qzerosize -qextname -qsuppress=cmpmsg") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3") set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
set(CMAKE_Fortran_FLAGS_DEBUG "-g") set(CMAKE_Fortran_FLAGS_DEBUG "-g")
endif() endif()

37
modules/cc.cmake
View File

@ -1,3 +1,31 @@
#.rst:
#
# Adds C support.
# Appends EXTRA_CFLAGS to CMAKE_C_FLAGS.
# If environment variable CFLAGS is set, then the CFLAGS are used
# and no other flags are used or appended.
#
# Variables used::
#
# EXTRA_CFLAGS
#
# Variables modified::
#
# CMAKE_C_FLAGS
#
# Environment variables used::
#
# CFLAGS
#
# Example autocmake.cfg entry::
#
# [cc]
# source: https://github.com/scisoft/autocmake/raw/master/modules/cc.cmake
# docopt: --cc=<CC> C compiler [default: gcc].
# --extra-cc-flags=<EXTRA_CFLAGS> Extra C compiler flags [default: ''].
# export: 'CC=%s' % arguments['--cc']
# define: '-DEXTRA_CFLAGS="%s"' % arguments['--extra-cc-flags']
enable_language(C) enable_language(C)
if(NOT DEFINED CMAKE_C_COMPILER_ID) if(NOT DEFINED CMAKE_C_COMPILER_ID)
@ -8,6 +36,11 @@ if(NOT CMAKE_C_COMPILER_WORKS)
message(FATAL_ERROR "CMAKE_C_COMPILER_WORKS is false!") message(FATAL_ERROR "CMAKE_C_COMPILER_WORKS is false!")
endif() endif()
if(DEFINED EXTRA_C_FLAGS) if(DEFINED EXTRA_CFLAGS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
endif()
if(DEFINED ENV{CFLAGS})
message(STATUS "CFLAGS is set to '$ENV{CFLAGS}'.")
set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
endif() endif()

45
modules/cxx.cmake
View File

@ -1,13 +1,46 @@
#.rst:
#
# Adds C++ support.
# Appends EXTRA_CXXFLAGS to CMAKE_CXX_FLAGS.
# If environment variable CXXFLAGS is set, then the CXXFLAGS are used
# and no other flags are used or appended.
#
# Variables used::
#
# EXTRA_CXXFLAGS
#
# Variables modified::
#
# CMAKE_CXX_FLAGS
#
# Environment variables used::
#
# CXXFLAGS
#
# Example autocmake.cfg entry::
#
# [cxx]
# source: https://github.com/scisoft/autocmake/raw/master/modules/cxx.cmake
# docopt: --cxx=<CXX> C++ compiler [default: g++].
# --extra-cxx-flags=<EXTRA_CXXFLAGS> Extra C++ compiler flags [default: ''].
# export: 'CXX=%s' % arguments['--cxx']
# define: '-DEXTRA_CXXFLAGS="%s"' % arguments['--extra-cxx-flags']
enable_language(CXX) enable_language(CXX)
if(NOT DEFINED CMAKE_CXX_COMPILER_ID) if(NOT DEFINED CMAKE_C_COMPILER_ID)
message(FATAL_ERROR "CMAKE_CXX_COMPILER_ID variable is not defined!") message(FATAL_ERROR "CMAKE_C_COMPILER_ID variable is not defined!")
endif() endif()
if(NOT CMAKE_CXX_COMPILER_WORKS) if(NOT CMAKE_C_COMPILER_WORKS)
message(FATAL_ERROR "CMAKE_CXX_COMPILER_WORKS is false!") message(FATAL_ERROR "CMAKE_C_COMPILER_WORKS is false!")
endif() endif()
if(DEFINED EXTRA_CXX_FLAGS) if(DEFINED EXTRA_CXXFLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}")
endif()
if(DEFINED ENV{CXXFLAGS})
message(STATUS "CXXFLAGS is set to '$ENV{CXXFLAGS}'.")
set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS}")
endif() endif()

8
modules/fc.cmake
View File

@ -5,10 +5,6 @@
# If environment variable FCFLAGS is set, then the FCFLAGS are used # If environment variable FCFLAGS is set, then the FCFLAGS are used
# and no other flags are used or appended. # and no other flags are used or appended.
# #
# Environment variables used::
#
# FCFLAGS
#
# Variables used:: # Variables used::
# #
# EXTRA_FCFLAGS # EXTRA_FCFLAGS
@ -21,6 +17,10 @@
# #
# CMAKE_Fortran_FLAGS # CMAKE_Fortran_FLAGS
# #
# Environment variables used::
#
# FCFLAGS
#
# Example autocmake.cfg entry:: # Example autocmake.cfg entry::
# #
# [fc] # [fc]

2
test/cxx/cmake/autocmake.cfg
View File

@ -4,7 +4,9 @@ name: example
[cxx] [cxx]
source: https://github.com/scisoft/autocmake/raw/master/modules/cxx.cmake source: https://github.com/scisoft/autocmake/raw/master/modules/cxx.cmake
docopt: --cxx=<CXX> C++ compiler [default: g++]. docopt: --cxx=<CXX> C++ compiler [default: g++].
--extra-cxx-flags=<EXTRA_CXXFLAGS> Extra C++ compiler flags [default: ''].
export: 'CXX=%s' % arguments['--cxx'] export: 'CXX=%s' % arguments['--cxx']
define: '-DEXTRA_CXXFLAGS="%s"' % arguments['--extra-cxx-flags']
[default_build_paths] [default_build_paths]
source: https://github.com/scisoft/autocmake/raw/master/modules/default_build_paths.cmake source: https://github.com/scisoft/autocmake/raw/master/modules/default_build_paths.cmake