Skip to content

Commit a986cf5

Browse files
authored
Re-enable Werror and related flags; bump nanobind_json module (#476)
1 parent ce85ef7 commit a986cf5

5 files changed

Lines changed: 15 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,20 @@ endif()
578578
foreach(target _PyPartMC)
579579
target_compile_options(${target} PRIVATE
580580
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
581-
# $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
582-
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unused-parameter>
581+
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter>
583582
)
584583
endforeach()
584+
585+
# TODO #482
586+
set_source_files_properties(
587+
src/run_part_opt.F90
588+
PROPERTIES COMPILE_OPTIONS "-Wno-error"
589+
)
590+
set_source_files_properties(
591+
src/run_part.F90
592+
PROPERTIES COMPILE_OPTIONS "-Wno-error"
593+
)
594+
585595
target_compile_definitions(_PyPartMC PRIVATE PMC_USE_SUNDIALS="1")
586596
include(CheckCXXSourceCompiles)
587597
file(GLOB PyPartMC_headers ${CMAKE_SOURCE_DIR}/src/*.hpp)

src/aero_particle.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ struct AeroParticle {
7272
{
7373
int len = AeroData::__len__(*self.aero_data);
7474
auto fn = f_aero_particle_volumes;
75-
auto aero_data_ptr = self.aero_data->ptr.f_arg();
7675
return pypartmc::get_array_values_set_len(self, fn, len);
7776
}
7877

src/run_part.F90

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
module PyPartMC_run_part
88

99
use iso_c_binding
10+
! TODO #482
1011
use pmc_run_part
1112
use camp_camp_core
1213
use pmc_photolysis

src/run_part_opt.F90

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
!###################################################################################################
66

77
module PyPartMC_run_part_opt
8+
! TODO #482
89
use pmc_run_part
910
use pmc_spec_file
1011
use pmc_output

0 commit comments

Comments
 (0)