Handle extra flags to Python differently.

This commit is contained in:
Ryan Curtin
2022-09-15 14:53:48 -04:00
parent 60d2206b69
commit b482bf994b
2 changed files with 6 additions and 1 deletions
+2 -1
View File
@@ -26,7 +26,8 @@ macro (post_python_bindings)
-D OpenMP_CXX_FLAGS="${OpenMP_CXX_FLAGS}"
-D DISABLE_CFLAGS="${DISABLE_CFLAGS}"
-D CYTHON_INCLUDE_DIRECTORIES="${CYTHON_INCLUDE_DIRECTORIES}"
-D CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -DMLPACK_PRINT_INFO -DMLPACK_PRINT_WARN"
-D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-D EXTRA_CXX_FLAGS="-DMLPACK_PRINT_INFO -DMLPACK_PRINT_WARN"
-D OUTPUT_DIR=${CMAKE_BINARY_DIR}
-P "${CMAKE_SOURCE_DIR}/CMake/ConfigureFile.cmake"
BYPRODUCTS "${CMAKE_BINARY_DIR}/src/mlpack/bindings/python/setup.py"
+4
View File
@@ -45,6 +45,10 @@ if os.getenv('NO_BUILD') == '1':
else:
cxx_flags = '${CMAKE_CXX_FLAGS}'.strip()
cxx_flags = re.sub(' +', ' ', cxx_flags)
extra_cxx_flags = '${EXTRA_CXX_FLAGS}'.strip()
extra_cxx_flags = re.sub(' +', ' ', cxx_flags)
cxx_flags += ' '
cxx_flags += extra_cxx_flags
extra_args = ['-DBINDING_TYPE=BINDING_TYPE_PYX', '-std=c++14']
if '${OpenMP_CXX_FLAGS}' != '':
extra_args.append('${OpenMP_CXX_FLAGS}')