Supporting MSVC19

Author: hassandraga

CMakeLists.txt

@@ -12,14 +12,18 @@ set(Boost_Version_Needed "1.76.0")
 set(Boost_NO_WARN_NEW_VERSIONS ON)
 
 if (WIN32)
-    if(EXISTS "C:/Alif3/")
-
-        # Windows - Boost
-        message("[*] Using Boost embeded with Alif v3 'C:/Alif3/boost'")
-        set(Boost_Root "C:/Alif3/boost/include")
-        set(Boost_Lib "C:/Alif3/boost/lib")
-        
-    endif()
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if(EXISTS "C:/Alif3/")
+            # Windows - Boost
+            message("[*] Using Boost embeded with Alif v3 'C:/Alif3/boost'")
+            set(Boost_Root "C:/Alif3/boost/include")
+            set(Boost_Lib "C:/Alif3/boost/lib")
+            set(BOOST_ROOT ${Boost_Root})
+            set(Boost_LIBRARY_DIR ${Boost_Lib})
+            message("[*] Using Boost root: ${BOOST_ROOT}")
+            message("[*] Using Boost lib: ${Boost_LIBRARY_DIR}")
+        endif()
+    endif() 
 endif()
 
 # --[ C++ ] ------------------------------------------------------------------------
@@ -55,5 +59,5 @@ add_subdirectory(${webui_SOURCE_DIR}/examples)
 
 # Test
 # include(CTest)
-enable_testing()
-add_subdirectory(${webui_SOURCE_DIR}/test)
+# enable_testing()
+# add_subdirectory(${webui_SOURCE_DIR}/test)

README.md

@@ -148,12 +148,12 @@ cd build
 
 Generate Visual Studio 2019 solution
 ```sh
-cmake .. -G "Visual Studio 16 2019" -DBOOST_ROOT=C:/local/boost_1_76_0 -DBOOST_LIBRARYDIR=C:/local/boost_1_76_0/lib64-msvc-14.2
+cmake .. -G "Visual Studio 16 2019" -DBOOST_ROOT=C:/local/boost_1_76_0 -DBOOST_LIBRARYDIR=C:/local/boost_1_76_0/lib64-msvc-14.2 -DCMAKE_BUILD_TYPE:STRING=Release
 ```
 
 Generate Makefile for Microsoft Visual Studio build tools 2019.
 ```sh
-cmake .. -G "NMake Makefiles" -DBOOST_ROOT=C:/local/boost_1_76_0 -DBOOST_LIBRARYDIR=C:/local/boost_1_76_0/lib64-msvc-14.2
+cmake .. -G "NMake Makefiles" -DBOOST_ROOT=C:/local/boost_1_76_0 -DBOOST_LIBRARYDIR=C:/local/boost_1_76_0/lib64-msvc-14.2 -DCMAKE_BUILD_TYPE:STRING=Release
 nmake
 ```
 

cwebui/CMakeLists.txt

@@ -16,15 +16,14 @@ message("[*] Initializing Boost for ${Info_Title}...")
 set(Boost_NO_WARN_NEW_VERSIONS ON)
 
 if (WIN32)
-	set(BOOST_ROOT ${Boost_Root})
-	set(Boost_LIBRARY_DIR ${Boost_Lib})
-	message("[*] Using Boost root: ${BOOST_ROOT}")
-	message("[*] Using Boost lib: ${Boost_LIBRARY_DIR}")
-
 	set(Boost_ARCHITECTURE 				"-x64")
 	set(Boost_USE_STATIC_LIBS			ON)
 	set(Boost_USE_MULTITHREADED			ON)
-	set(Boost_USE_STATIC_RUNTIME		ON)
+	if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+		set(Boost_USE_STATIC_RUNTIME		OFF)
+	else()
+		set(Boost_USE_STATIC_RUNTIME		ON)
+	endif()
 	# set(Boost_COMPILER				"-mgw8")
 
 	# set(Boost_DETAILED_FAILURE_MSG	OFF)
@@ -129,6 +128,7 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	set_property(TARGET ${Info_App} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded")
 
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+	set(CMAKE_CXX_STANDARD 20)
 
 	#add_compile_options("-shared -fPIC -O2")
 	#SET(F_PIC "-shared -fPIC -O2")

examples/CMakeLists.txt

@@ -9,20 +9,19 @@ link_directories(${webui_BIN_DIR}/webui)
 
 # --[ Boost ] ----------------------------------------------------------------------
 
-message("[*] Initializing Boost for ${Info_Title}... ${webui_lib}")
+message("[*] Initializing Boost for ${Info_Title}... ")
 
 set(Boost_NO_WARN_NEW_VERSIONS ON)
 
 if (WIN32)
-	set(BOOST_ROOT ${Boost_Root})
-	set(Boost_LIBRARY_DIR ${Boost_Lib})
-	message("[*] Using Boost root: ${BOOST_ROOT}")
-	message("[*] Using Boost lib: ${Boost_LIBRARY_DIR}")
-
 	set(Boost_ARCHITECTURE 				"-x64")
 	set(Boost_USE_STATIC_LIBS			ON)
 	set(Boost_USE_MULTITHREADED			ON)
-	set(Boost_USE_STATIC_RUNTIME		ON)
+	if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+		set(Boost_USE_STATIC_RUNTIME		OFF)
+	else()
+		set(Boost_USE_STATIC_RUNTIME		ON)
+	endif()
 	# set(Boost_COMPILER				"-mgw8")
 
 	# set(Boost_DETAILED_FAILURE_MSG	OFF)

src/CMakeLists.txt

@@ -16,15 +16,14 @@ message("[*] Initializing Boost for ${Info_Title}...")
 set(Boost_NO_WARN_NEW_VERSIONS ON)
 
 if (WIN32)
-	set(BOOST_ROOT ${Boost_Root})
-	set(Boost_LIBRARY_DIR ${Boost_Lib})
-	message("[*] Using Boost root: ${BOOST_ROOT}")
-	message("[*] Using Boost lib: ${Boost_LIBRARY_DIR}")
-
 	set(Boost_ARCHITECTURE 				"-x64")
 	set(Boost_USE_STATIC_LIBS			ON)
 	set(Boost_USE_MULTITHREADED			ON)
-	set(Boost_USE_STATIC_RUNTIME		ON)
+	if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+		set(Boost_USE_STATIC_RUNTIME		OFF)
+	else()
+		set(Boost_USE_STATIC_RUNTIME		ON)
+	endif()
 	# set(Boost_COMPILER				"-mgw8")
 
 	# set(Boost_DETAILED_FAILURE_MSG	OFF)
@@ -119,6 +118,7 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	# set_property(TARGET ${Info_App} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded")
 
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+	set(CMAKE_CXX_STANDARD 20)
 
 endif()
 
@@ -142,7 +142,7 @@ endif (UNIX)
 if(UNIX)
 	message("[*] Initializing debian package...")
 	SET(CPACK_GENERATOR "DEB")
-	SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "KK") #required
+	SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "webui") #required
 	INCLUDE(CPack)
 endif (UNIX)