|  | @@ -23,6 +23,7 @@ unset(spdlog_STATIC_LIBRARY CACHE)
 | 
	
		
			
				|  |  |  #查找库文件,需要判断操作系统,位数
 | 
	
		
			
				|  |  |  if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 | 
	
		
			
				|  |  |      if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 | 
	
		
			
				|  |  | +        #64位
 | 
	
		
			
				|  |  |          if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 | 
	
		
			
				|  |  |              if(CMAKE_BUILD_TYPE MATCHES "Debug")
 | 
	
		
			
				|  |  |                  list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3/libspdlogd.dll)
 | 
	
	
		
			
				|  | @@ -31,18 +32,27 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 | 
	
		
			
				|  |  |              endif()
 | 
	
		
			
				|  |  |              if(ENABLE_SPDLOG_STATIC_LIB)
 | 
	
		
			
				|  |  |                  if(CMAKE_BUILD_TYPE MATCHES "Debug")
 | 
	
		
			
				|  |  | -                    list(APPEND spdlog_STATIC_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_static/libspdlog.a)
 | 
	
		
			
				|  |  | +                    list(APPEND spdlog_STATIC_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_static/libspdlogd.a)
 | 
	
		
			
				|  |  |                  else()
 | 
	
		
			
				|  |  |                      list(APPEND spdlog_STATIC_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_static/libspdlog.a)
 | 
	
		
			
				|  |  |                  endif()
 | 
	
		
			
				|  |  |              endif()
 | 
	
		
			
				|  |  | -            
 | 
	
		
			
				|  |  | +        #32位
 | 
	
		
			
				|  |  |          elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
 | 
	
		
			
				|  |  | -            # if(CMAKE_BUILD_TYPE MATCHES "Debug")
 | 
	
		
			
				|  |  | -            #     list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_32/libspdlog.dll)
 | 
	
		
			
				|  |  | -            # else()
 | 
	
		
			
				|  |  | -            #     list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_32/libspdlog.dll)
 | 
	
		
			
				|  |  | -            # endif()
 | 
	
		
			
				|  |  | +            #动态库
 | 
	
		
			
				|  |  | +            if(CMAKE_BUILD_TYPE MATCHES "Debug")
 | 
	
		
			
				|  |  | +                list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_32/libspdlogd.dll)
 | 
	
		
			
				|  |  | +            else()
 | 
	
		
			
				|  |  | +                list(APPEND spdlog_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_32/libspdlog.dll)
 | 
	
		
			
				|  |  | +            endif()
 | 
	
		
			
				|  |  | +            #静态库
 | 
	
		
			
				|  |  | +            if(ENABLE_SPDLOG_STATIC_LIB)
 | 
	
		
			
				|  |  | +                if(CMAKE_BUILD_TYPE MATCHES "Debug")
 | 
	
		
			
				|  |  | +                    list(APPEND spdlog_STATIC_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_static_32/libspdlogd.a)
 | 
	
		
			
				|  |  | +                else()
 | 
	
		
			
				|  |  | +                    list(APPEND spdlog_STATIC_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/windows/gcc7.3_static_32/libspdlog.a)
 | 
	
		
			
				|  |  | +                endif()
 | 
	
		
			
				|  |  | +            endif()
 | 
	
		
			
				|  |  |          endif()
 | 
	
		
			
				|  |  |      elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 | 
	
		
			
				|  |  |          if(CMAKE_BUILD_TYPE MATCHES "Debug")
 | 
	
	
		
			
				|  | @@ -86,18 +96,17 @@ endif()
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  # message(STATUS "spdlog_INCLUDE_DIR: ${spdlog_INCLUDE_DIR}")
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -if(spdlog_INCLUDE_DIR AND spdlog_LIBRARY)
 | 
	
		
			
				|  |  | +if(spdlog_INCLUDE_DIR AND (spdlog_LIBRARY OR spdlog_STATIC_LIBRARY))
 | 
	
		
			
				|  |  |      set(spdlog_FOUND TRUE)
 | 
	
		
			
				|  |  |      set(spdlog_VERSION 1.14.1)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      message(STATUS "如果需要使用静态库,定义“ ENABLE_SPDLOG_STATIC_LIB ”变量")
 | 
	
		
			
				|  |  | -    if(ENABLE_SPDLOG_STATIC_LIB)
 | 
	
		
			
				|  |  | -        message(STATUS "include : spdlog_INCLUDE_DIR")
 | 
	
		
			
				|  |  | +    message(STATUS "include : spdlog_INCLUDE_DIR")
 | 
	
		
			
				|  |  | +    if(spdlog_LIBRARY)
 | 
	
		
			
				|  |  |          message(STATUS "Library : spdlog_LIBRARY")
 | 
	
		
			
				|  |  | +    endif()
 | 
	
		
			
				|  |  | +    if(ENABLE_SPDLOG_STATIC_LIB)
 | 
	
		
			
				|  |  |          message(STATUS "Static Library : spdlog_STATIC_LIBRARY")
 | 
	
		
			
				|  |  | -    else()
 | 
	
		
			
				|  |  | -        message(STATUS "include : spdlog_INCLUDE_DIR")
 | 
	
		
			
				|  |  | -        message(STATUS "Library : spdlog_LIBRARY")
 | 
	
		
			
				|  |  |      endif()
 | 
	
		
			
				|  |  |  else()
 | 
	
		
			
				|  |  |      set(spdlog_FOUND FALSE)
 |