Skip to content

Commit

Permalink
Merge branch 'master' into osx
Browse files Browse the repository at this point in the history
  • Loading branch information
certik committed Jul 26, 2019
2 parents 4abea71 + 1314098 commit 6c5fab8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ Documentation
* Add :doc:`/notes` section to the `For maintainers` top-level category that includes a comparison between
`sysconfig` and `distutils.sysconfig` modules.

* Remove obsolete comment in `cmaker.py`. See :issue:`439`. Thanks :user:`isuruf`

Tests
-----

Expand Down
2 changes: 0 additions & 2 deletions skbuild/cmaker.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ def configure(self, clargs=(), generator_name=None, skip_generator_test=False,
if cli_generator_name is not None:
generator_name = cli_generator_name

# use the generator returned from the platform, with the current
# generator_name as a suggestion
generator = self.platform.get_best_generator(
generator_name, skip_generator_test=skip_generator_test,
cmake_executable=self.cmake_executable, cmake_args=clargs,
Expand Down

0 comments on commit 6c5fab8

Please sign in to comment.