Skip to content

Commit 230d04c

Browse files
committed
rm redundant code
1 parent 6e670b9 commit 230d04c

File tree

7 files changed

+2
-54
lines changed

7 files changed

+2
-54
lines changed

CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake/downloade
2222

2323
# included cmake modules
2424
include(autocmake_fc_optional)
25-
include(autocmake_cc)
2625
include(autocmake_cxx)
2726
include(autocmake_GNU.CXX)
2827
include(autocmake_Intel.CXX)

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.0
1+
0.5.1-alpha

cmake/autocmake.yml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ modules:
88
- compilers:
99
- source:
1010
- '%(url_root)modules/fc_optional.cmake'
11-
- '%(url_root)modules/cc.cmake'
1211
- '%(url_root)modules/cxx.cmake'
1312
- flags:
1413
- source:

cmake/downloaded/autocmake_cc.cmake

-45
This file was deleted.

requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ pytest
33
pep8
44
cpp-coveralls
55
numpy
6-
pyyaml

setup

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Options:
2121
--fc=<FC> Fortran compiler [default: gfortran].
2222
--extra-fc-flags=<EXTRA_FCFLAGS> Extra Fortran compiler flags [default: ''].
2323
--fc-support=<FC_SUPPORT> Toggle Fortran language support (ON/OFF) [default: ON].
24-
--cc=<CC> C compiler [default: gcc].
25-
--extra-cc-flags=<EXTRA_CFLAGS> Extra C compiler flags [default: ''].
2624
--cxx=<CXX> C++ compiler [default: g++].
2725
--extra-cxx-flags=<EXTRA_CXXFLAGS> Extra C++ compiler flags [default: ''].
2826
--python=<PYTHON_INTERPRETER> The Python interpreter (development version) to use. [default: ''].
@@ -46,12 +44,10 @@ def gen_cmake_command(options, arguments):
4644
"""
4745
command = []
4846
command.append('FC={0}'.format(arguments['--fc']))
49-
command.append('CC={0}'.format(arguments['--cc']))
5047
command.append('CXX={0}'.format(arguments['--cxx']))
5148
command.append(arguments['--cmake-executable'])
5249
command.append('-DEXTRA_FCFLAGS="{0}"'.format(arguments['--extra-fc-flags']))
5350
command.append('-DENABLE_FC_SUPPORT={0}'.format(arguments['--fc-support']))
54-
command.append('-DEXTRA_CFLAGS="{0}"'.format(arguments['--extra-cc-flags']))
5551
command.append('-DEXTRA_CXXFLAGS="{0}"'.format(arguments['--extra-cxx-flags']))
5652
command.append('-DPYTHON_INTERPRETER="{0}"'.format(arguments['--python']))
5753
command.append('-DUSE_CCACHE={0}'.format(arguments['--ccache']))

test/test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ def test_h2o_grid(context):
129129
def test_version():
130130
import numgrid
131131

132-
assert numgrid.get_version() == '0.5.0'
132+
assert numgrid.get_version() == '0.5.1-alpha'

0 commit comments

Comments
 (0)