Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions scripts/test_build_external.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
parser.add_argument('--cmake', default=os.environ.get('CMAKE'), help='Path to cmake. Defaults to CMAKE or PATH lookup.')
parser.add_argument('--cc', default=os.environ.get('CC'), help='C compiler to use. Defaults to CC or CMake platform default.')
parser.add_argument('--cxx', default=os.environ.get('CXX'), help='C++ compiler to use. Defaults to CXX or CMake platform default.')
parser.add_argument('--config', default=os.environ.get('CMAKE_BUILD_CONFIG', 'Release'),
help='CMake build configuration to use. Defaults to CMAKE_BUILD_CONFIG or Release.')
parser.add_argument('--extra-project', action='append', default=[],
help='Additional out-of-tree CMake project directory to build. May be specified multiple times.')
args = parser.parse_args()
Expand Down Expand Up @@ -170,9 +172,10 @@ def external_project_cmake_files():

print(f'C compiler: {configure_env.get("CC", "CMake platform default")}')
print(f'C++ compiler: {configure_env.get("CXX", "CMake platform default")}')
print(f'CMake build config: {args.config}')

configure_args = []
build_args = []
configure_args = [f'-DCMAKE_BUILD_TYPE={args.config}']
build_args = ['--config', args.config]

if platform.system() == "Windows":
configure_env['CXXFLAGS'] = f'/MP{args.parallel}'
Expand Down
7 changes: 5 additions & 2 deletions scripts/test_build_internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
parser.add_argument('--cmake', default=os.environ.get('CMAKE'), help='Path to cmake. Defaults to CMAKE or PATH lookup.')
parser.add_argument('--cc', default=os.environ.get('CC'), help='C compiler to use. Defaults to CC or CMake platform default.')
parser.add_argument('--cxx', default=os.environ.get('CXX'), help='C++ compiler to use. Defaults to CXX or CMake platform default.')
parser.add_argument('--config', default=os.environ.get('CMAKE_BUILD_CONFIG', 'Release'),
help='CMake build configuration to use. Defaults to CMAKE_BUILD_CONFIG or Release.')
args = parser.parse_args()

api_base = Path(__file__).parent.parent.absolute()
Expand Down Expand Up @@ -113,9 +115,10 @@ def configure_binary_ninja_env(env):

print(f'C compiler: {env.get("CC", "CMake platform default")}')
print(f'C++ compiler: {env.get("CXX", "CMake platform default")}')
print(f'CMake build config: {args.config}')

configure_args = ['-DBN_API_BUILD_EXAMPLES=1']
build_args = []
configure_args = ['-DBN_API_BUILD_EXAMPLES=1', f'-DCMAKE_BUILD_TYPE={args.config}']
build_args = ['--config', args.config]

if platform.system() == 'Windows':
env['CXXFLAGS'] = f'/MP{args.parallel}'
Expand Down