Skip to content

Commit

Permalink
Fix scikit-build#342, defaulting only when needed.
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedersen committed Jul 19, 2018
1 parent 7a9fb3e commit 5f60c9b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions skbuild/setuptools_wrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,11 @@ def setup(*args, **kw): # noqa: C901
for parent_dir, file_list in kw.get('data_files', [])
}

# Since CMake arguments provided through the command line have more
# weight and when CMake is given multiple times a argument, only the last
# one is considered, let's prepend the one provided in the setup call.
cmake_args = skbuild_kw['cmake_args'] + cmake_args

if sys.platform == 'darwin':

if plat_name is None:
Expand Down Expand Up @@ -500,11 +505,6 @@ def setup(*args, **kw): # noqa: C901
cmake_executable = os.path.join(cmake.CMAKE_BIN_DIR, 'cmake')
break

# Since CMake arguments provided through the command line have more
# weight and when CMake is given multiple times a argument, only the last
# one is considered, let's prepend the one provided in the setup call.
cmake_args = skbuild_kw['cmake_args'] + cmake_args

# Languages are used to determine a working generator
cmake_languages = skbuild_kw['cmake_languages']

Expand Down

0 comments on commit 5f60c9b

Please sign in to comment.