From 6f319472056b88a940f53d45008e110ffad0db2b Mon Sep 17 00:00:00 2001 From: Bruno Marques Date: Tue, 16 Jun 2020 14:05:39 +0200 Subject: [PATCH 1/4] Making the sized-deallocation compile option public & removing its redundant counterpart in binding modules --- CMake/SofaPython3Tools.cmake | 4 ---- Plugin/CMakeLists.txt | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index 7395581a..af3ad361 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -109,10 +109,6 @@ function(SP3_add_python_module) PUBLIC $ ) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - target_compile_options(${A_TARGET} PRIVATE -fsized-deallocation) - endif() - if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") target_compile_options(${A_TARGET} PRIVATE -Dregister=) endif() diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt index 45912fc3..58f1687a 100644 --- a/Plugin/CMakeLists.txt +++ b/Plugin/CMakeLists.txt @@ -59,8 +59,7 @@ set_target_properties( ) if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - # Sized deallocaion is not enabled by default under clang after c++14 - set(CMAKE_CXX_FLAGS "-fsized-deallocation") + target_compile_options(${PROJECT_NAME} PUBLIC "-fsized-deallocation") endif () if(CMAKE_SYSTEM_NAME STREQUAL Linux) From af13cc2870dd411eae176f5f1541f4e1ba8be2cf Mon Sep 17 00:00:00 2001 From: Bruno Marques Date: Wed, 17 Jun 2020 09:20:47 +0200 Subject: [PATCH 2/4] Restore sized-deallocation flag in python modules --- CMake/SofaPython3Tools.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index af3ad361..7395581a 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -109,6 +109,10 @@ function(SP3_add_python_module) PUBLIC $ ) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + target_compile_options(${A_TARGET} PRIVATE -fsized-deallocation) + endif() + if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") target_compile_options(${A_TARGET} PRIVATE -Dregister=) endif() From d4dd63dbfe8204b085a7143f33df81300650329e Mon Sep 17 00:00:00 2001 From: Bruno Marques Date: Wed, 17 Jun 2020 09:21:43 +0200 Subject: [PATCH 3/4] Update CMakeLists.txt --- Plugin/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt index 58f1687a..ee18a241 100644 --- a/Plugin/CMakeLists.txt +++ b/Plugin/CMakeLists.txt @@ -59,6 +59,7 @@ set_target_properties( ) if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") + # Sized deallocaion is not enabled by default under clang after c++14 target_compile_options(${PROJECT_NAME} PUBLIC "-fsized-deallocation") endif () From 6e9144e90b8eb30ffa4650441579b1020656ad93 Mon Sep 17 00:00:00 2001 From: Bruno Marques Date: Wed, 17 Jun 2020 09:22:53 +0200 Subject: [PATCH 4/4] Update SofaPython3Tools.cmake --- CMake/SofaPython3Tools.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/SofaPython3Tools.cmake b/CMake/SofaPython3Tools.cmake index 7395581a..fb2acd39 100644 --- a/CMake/SofaPython3Tools.cmake +++ b/CMake/SofaPython3Tools.cmake @@ -110,7 +110,7 @@ function(SP3_add_python_module) ) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - target_compile_options(${A_TARGET} PRIVATE -fsized-deallocation) + target_compile_options(${A_TARGET} PUBLIC -fsized-deallocation) endif() if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")