Merge pull request #94 from Xaymar/patch_build-with-debug

Linking with Debug libraries, Debug information and CEF_ROOT_DIR in CMake cache info

Author: OsirisNL

CMakeLists.txt

@@ -16,14 +16,24 @@ if(MSVC)
 	option(USE_STATIC_CRT "Use static CRT" ON)
 
 	if(USE_STATIC_CRT)
-		set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS} /MT")
-		set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} /MT")
-		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /MT")
-		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} /MTd")
-		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} /MT")
-		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} /MT")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /MT")
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} /MTd")
+		string(REPLACE "/MD" "/MT" 
+			"CMAKE_C_FLAGS" 
+			"${CMAKE_C_FLAGS}")
+
+		string(REPLACE "/MD" "/MT" 
+			"CMAKE_CXX_FLAGS" 
+			"${CMAKE_CXX_FLAGS}")
+
+		string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" UPPER_CONFIG_TYPES)
+		foreach(CONFIG_TYPE ${UPPER_CONFIG_TYPES})
+			string(REPLACE "/MD" "/MT" 
+				"CMAKE_C_FLAGS_${CONFIG_TYPE}" 
+				"${CMAKE_C_FLAGS_${CONFIG_TYPE}}")
+
+			string(REPLACE "/MD" "/MT" 
+				"CMAKE_CXX_FLAGS_${CONFIG_TYPE}" 
+				"${CMAKE_CXX_FLAGS_${CONFIG_TYPE}}")
+		endforeach()
 	endif()
 endif()
 

FindCEF.cmake

@@ -1,5 +1,7 @@
 include(FindPackageHandleStandardArgs)
 
+SET(CEF_ROOT_DIR "" CACHE PATH "Path to a CEF distributed build")
+
 message("Looking for Chromium Embedded Framework in ${CEF_ROOT_DIR}")
 
 find_path(CEF_INCLUDE_DIR "include/cef_version.h"
@@ -8,10 +10,16 @@ find_path(CEF_INCLUDE_DIR "include/cef_version.h"
 find_library(CEF_LIBRARY
 	NAMES cef libcef cef.lib libcef.o "Chromium Embedded Framework"
 	PATHS ${CEF_ROOT_DIR} ${CEF_ROOT_DIR}/Release)
+find_library(CEF_LIBRARY_DEBUG
+	NAMES cef libcef cef.lib libcef.o "Chromium Embedded Framework"
+	PATHS ${CEF_ROOT_DIR} ${CEF_ROOT_DIR}/Debug)
 
 find_library(CEFWRAPPER_LIBRARY
 	NAMES cef_dll_wrapper libcef_dll_wrapper
-	PATHS ${CEF_ROOT_DIR}/build/libcef_dll ${CEF_ROOT_DIR}/build/libcef_dll_wrapper)
+	PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Release ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Release)
+find_library(CEFWRAPPER_LIBRARY_DEBUG
+	NAMES cef_dll_wrapper libcef_dll_wrapper
+	PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Debug ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Debug)
 
 if (NOT CEF_LIBRARY)
 	message(FATAL_ERROR "Could not find the CEF shared library" )
@@ -22,8 +30,10 @@ if (NOT CEFWRAPPER_LIBRARY)
 endif (NOT CEFWRAPPER_LIBRARY)
 
 set(CEF_LIBRARIES
-	${CEF_LIBRARY}
-	${CEFWRAPPER_LIBRARY})
+	debug ${CEFWRAPPER_LIBRARY_DEBUG}
+	debug ${CEF_LIBRARY_DEBUG}
+	optimized ${CEFWRAPPER_LIBRARY}
+	optimized ${CEF_LIBRARY})
 
 find_package_handle_standard_args(CEF DEFAULT_MSG CEF_LIBRARY 
 	CEFWRAPPER_LIBRARY CEF_INCLUDE_DIR)