Merge branch 'master' of github.com:ufz/ogs

BaseLib/CMakeLists.txt

@@ -13,4 +13,9 @@ INCLUDE_DIRECTORIES(
         .
 )
 
+# Add logog subdirectory and group its targets in a Visual Studio folder
 ADD_SUBDIRECTORY(logog)
+SET_PROPERTY(TARGET Continuous PROPERTY FOLDER "logog")
+SET_PROPERTY(TARGET logog PROPERTY FOLDER "logog")
+SET_PROPERTY(TARGET logog-doc PROPERTY FOLDER "logog")
+SET_PROPERTY(TARGET test-logog PROPERTY FOLDER "logog")
\ No newline at end of file

scripts/cmake/CompilerSetup.cmake

 INCLUDE(ResetConfigurations)        # To Debug, Release, RelWithDbgInfo
 INCLUDE(SetDefaultBuildType)
+INCLUDE(DisableCompilerFlag)
 SET_DEFAULT_BUILD_TYPE(Debug)
 INCLUDE(MSVCMultipleProcessCompile) # /MP switch (multi processor) for VS
 
@@ -67,6 +68,8 @@ IF (WIN32)
 		)
 		# Sets warning level 3 and ignores some warnings
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /wd4290 /wd4267")
+
+		DisableCompilerFlag(DEBUG /RTC1)
 	# cygwin
 	ELSE (MSVC)
 		MESSAGE (STATUS "Might be GCC under cygwin.")

scripts/cmake/ProjectSetup.cmake

@@ -12,3 +12,6 @@ IF(NOT DEFINED OGS_LOG_LEVEL)
 ELSE()
 	ADD_DEFINITIONS(-DLOGOG_LEVEL=${OGS_LOG_LEVEL})
 ENDIF() # NOT DEFINED OGS_LOG_LEVEL
+
+# Enable Visual Studio project folder grouping
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
\ No newline at end of file

scripts/cmake/cmake/DisableCompilerFlag.cmake

+# DisableCompilerFlag.cmake
+#
+# 2012-05-14 Lars Bilke
+#
+# Removes the given FLAG from the compiler flags in the given CONFIGURATION.
+# The Configuration must be uppercased.
+#
+# Usage:
+# 
+#   include(DisableCompilerFlag)
+#   if (MSVC)
+#     DisableCompilerFlag(DEBUG /RTC1)
+#   endif ()
+
+macro(DisableCompilerFlag CONFIGURATION FLAG)
+	if(CMAKE_CXX_FLAGS_${CONFIGURATION} MATCHES "${FLAG}")
+		string(REPLACE "${FLAG}" " " CMAKE_CXX_FLAGS_${CONFIGURATION} "${CMAKE_CXX_FLAGS_${CONFIGURATION}}")
+		# message(STATUS ${PROJECT_NAME}  " CMAKE_CXX_FLAGS_${CONFIGURATION} removing ${FLAG}")
+	endif()
+endmacro()
\ No newline at end of file