X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=965f22f3c54427cb0008287e4246193f95223887;hb=7f6d93955aa723e0be56979966055e6448b872a4;hp=eaea862108c934ec808b8fa70f56f8398d16fb5a;hpb=23041f53ea3c15e2bed267d06c2932310b19a3ad;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaea862108..965f22f3c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,7 +285,7 @@ if(UNIX OR MINGW)
 	endif()
 	set(LYX_GCC11_MODE "${CXX11_FLAG}")
 else()
-	if(MSVC_VERSION LESS 1915))
+	if(MSVC_VERSION LESS 1915)
 		set(LYX_USE_STD_REGEX 0)
 	else()
 		set(LYX_USE_STD_REGEX 1)
@@ -555,7 +555,7 @@ include(ProjectSourceGroup)
 
 
 if(LYX_PROFILE AND NOT MSVC)
-	set(CMAKE_BUILD_TYPE Profile CACHE TYPE STRING FORCE)
+	set(CMAKE_BUILD_TYPE Profile CACHE STRING "Profile build type" FORCE)
 	set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -pg")
 	set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS}  -pg")
 else()
@@ -605,12 +605,12 @@ if(NOT MSVC)
 	if(LYX_STDLIB_DEBUG)
 		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
 	endif()
-	set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
-	set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -D_DEBUG" CACHE TYPE STRING FORCE)
+	set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE STRING "Set CXX flags" FORCE)
+	set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -D_DEBUG" CACHE STRING "Set debug flags" FORCE)
 	if(MINGW)
-		set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE TYPE STRING FORCE)
+		set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set release flags for Mingw" FORCE)
 	else()
-		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE TYPE STRING FORCE)
+		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set release flags" FORCE)
 	endif()
 endif()
 
@@ -926,7 +926,7 @@ if(MSVC)
 
 	if(LYX_WALL)
 		# Use the highest warning level
-		set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE)
+		set(CMAKE_CXX_WARNING_LEVEL 4 CACHE STRING "Warning level" FORCE)
 
 		if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
 			string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -950,7 +950,7 @@ if(MSVC)
 		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
 
 	else()
-		set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE)
+		set(CMAKE_CXX_WARNING_LEVEL 3 CACHE STRING "Warning level" FORCE)
 
 		# add here warnings which should produce an error /weXXXX
 		set(MSVC_W_ERROR   "/we4101 /we4189")