https://bugs.kde.org/show_bug.cgi?id=398582

--- Comment #59 from caulier.gil...@gmail.com ---
Git commit 7afb2e4d96dc4d972809395ca17defc1ffb1a049 by Gilles Caulier.
Committed on 01/11/2023 at 09:29.
Pushed by cgilles into branch 'master'.

remove MSVC obsolete options now managed by ECM in background. Add new option
for MSVC 2022

M  +1    -8    CMakeLists.txt

https://invent.kde.org/graphics/digikam/-/commit/7afb2e4d96dc4d972809395ca17defc1ffb1a049

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bde0eeb064..798e49108f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,14 +149,7 @@ set(CMAKE_AUTOMOC ON)

 if(MSVC)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
-    # These settings comes with ecm 5.88 , so when we bump KF/ecm to 5.88+ we
can remove these
-    add_compile_options(/utf-8)
-    if (CMAKE_CXX_STANDARD GREATER_EQUAL 11)
-        # Ensure __cplusplus is correct, otherwise it defaults to 199711L
which isn't true
-        #
https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-160
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
-    endif()
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
 endif()

 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to