Skip to content

#14654 Fix Linux Release build defining NO_DEBUG instead of NDEBUG #14744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
magnesj wants to merge 3 commits into
base: dev
Choose a base branch
from
+16 −22
Open

#14654 Fix Linux Release build defining NO_DEBUG instead of NDEBUG #14744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2953dd
#14654 Fix Linux Release build defining NO_DEBUG instead of NDEBUG
magnesj Sep 13, 2026
138d212
#14654 Fix uninitialized VfpValueSelection members causing Linux Rele…
magnesj Sep 13, 2026
1016b9b
#14654 Fix uninitialized intersectedCellFaceOut in MSW table data export
magnesj Sep 13, 2026
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
13 changes: 7 additions & 6 deletions ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswTableData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,13 @@ std::vector<WellPathCellIntersectionInfo>

WellPathCellIntersectionInfo extraIntersection;

extraIntersection.globCellIndex = std::numeric_limits<size_t>::max();
extraIntersection.startPoint = intersectionPoint;
extraIntersection.endPoint = firstIntersection.startPoint;
extraIntersection.startMD = initialMD;
extraIntersection.endMD = firstIntersection.startMD;
extraIntersection.intersectedCellFaceIn = cvf::StructGridInterface::NO_FACE;
extraIntersection.globCellIndex = std::numeric_limits<size_t>::max();
extraIntersection.startPoint = intersectionPoint;
extraIntersection.endPoint = firstIntersection.startPoint;
extraIntersection.startMD = initialMD;
extraIntersection.endMD = firstIntersection.startMD;
extraIntersection.intersectedCellFaceIn = cvf::StructGridInterface::NO_FACE;
extraIntersection.intersectedCellFaceOut = cvf::StructGridInterface::NO_FACE;

if ( firstIntersection.intersectedCellFaceIn != cvf::StructGridInterface::NO_FACE )

Expand Down
10 changes: 5 additions & 5 deletions ApplicationLibCode/ReservoirDataModel/RigVfpTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ struct VfpTableSelection

struct VfpValueSelection
{
double flowRateValue;
double thpValue;
double artificialLiftQuantityValue;
double waterCutValue;
double gasLiquidRatioValue;
double flowRateValue = 0.0;
double thpValue = 0.0;
double artificialLiftQuantityValue = 0.0;
double waterCutValue = 0.0;
double gasLiquidRatioValue = 0.0;

std::vector<double> familyValues;
};
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

set(VIZ_MODULES_FOLDER_NAME Fwk/VizFwk)

message(STATUS "Set CEE_USE_QT6 to ON")
# Instruct cvf to use Qt6
set(CEE_USE_QT5 OFF)
set(CEE_USE_QT6 ON)

Expand Down Expand Up @@ -141,7 +141,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
)
endif()
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -g3 -O0 -DDEBUG -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
endif()

include(cmake/StdStacktrace.cmake)
Expand Down
11 changes: 3 additions & 8 deletions Fwk/AppFwk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,9 @@ if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif()

# Qt
if(NOT DEFINED (CEE_USE_QT5))
option(CEE_USE_QT5 "Use Qt5" ON)
endif(NOT DEFINED (CEE_USE_QT5))

if(NOT DEFINED (CEE_USE_QT6))
option(CEE_USE_QT6 "Use Qt6" OFF)
endif(NOT DEFINED (CEE_USE_QT6))
# Instruct cvf to use Qt6
set(CEE_USE_QT5 OFF)
set(CEE_USE_QT6 ON)

# CeeViz is not available here, exclude it from the build
set(CAF_EXCLUDE_CVF ON)
Expand Down
1 change: 0 additions & 1 deletion Fwk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
"-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat -Wno-unused-parameter"
)
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -g3 -O0 -DDEBUG -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
endif()

find_package(
Expand Down