From a4d2154a8146bec0553d98903b134f8c5b22b7bd Mon Sep 17 00:00:00 2001 From: Harsh Vardhan Date: Tue, 28 Mar 2023 17:37:58 -0700 Subject: [PATCH 1/3] fix: Fix PR conflicts Signed-off-by: Harsh Vardhan --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 222bbedf..a5646bf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,13 +506,13 @@ target_include_directories(OpenSTA ) # common to gcc/clang -set(CXX_FLAGS -Wall -Wextra -pedantic -Wcast-qual -Wredundant-decls -Wformat-security) +set(CXX_COMMON_FLAGS -Wall -Wextra -pedantic -Wcast-qual -Wredundant-decls -Wformat-security -Wp,-D_GLIBCXX_ASSERTIONS) target_compile_options(OpenSTA PRIVATE - $<$:${CXX_FLAGS}> - $<$:${CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments> - $<$:${CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments> + $<$:${CXX_COMMON_FLAGS}> + $<$:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments> + $<$:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments> ) # Disable compiler specific extensions like gnu++11. From c34f6bb67a569ee1f5e7c325fdd5254c489d796e Mon Sep 17 00:00:00 2001 From: Harsh Vardhan Date: Tue, 28 Mar 2023 18:29:08 -0700 Subject: [PATCH 2/3] fix: merge conflict Signed-off-by: Harsh Vardhan --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5646bf3..b5643519 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -505,14 +505,13 @@ target_include_directories(OpenSTA ${CUDD_INCLUDE} ) -# common to gcc/clang set(CXX_COMMON_FLAGS -Wall -Wextra -pedantic -Wcast-qual -Wredundant-decls -Wformat-security -Wp,-D_GLIBCXX_ASSERTIONS) target_compile_options(OpenSTA PRIVATE $<$:${CXX_COMMON_FLAGS}> - $<$:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments> $<$:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments> + $<$:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments> ) # Disable compiler specific extensions like gnu++11. From 31a77f2d723366a180c308ebe623e89109e266e1 Mon Sep 17 00:00:00 2001 From: Harsh Vardhan Date: Tue, 28 Mar 2023 18:31:32 -0700 Subject: [PATCH 3/3] fix: another attempt to fix conflict Signed-off-by: Harsh Vardhan --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5643519..30d013cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,7 +506,6 @@ target_include_directories(OpenSTA ) set(CXX_COMMON_FLAGS -Wall -Wextra -pedantic -Wcast-qual -Wredundant-decls -Wformat-security -Wp,-D_GLIBCXX_ASSERTIONS) - target_compile_options(OpenSTA PRIVATE $<$:${CXX_COMMON_FLAGS}>