You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@logging.apache.org by GitBox <gi...@apache.org> on 2021/03/30 08:37:55 UTC

[GitHub] [logging-log4cxx] ams-tschoening commented on a change in pull request #59: Logcxx-521

ams-tschoening commented on a change in pull request #59:
URL: https://github.com/apache/logging-log4cxx/pull/59#discussion_r603874214



##########
File path: src/main/include/CMakeLists.txt
##########
@@ -67,12 +67,17 @@ include(CheckCXXSymbolExists)
 include(CheckIncludeFiles)
 include(CheckIncludeFileCXX)
 include(CheckLibraryExists)
-include(FindPkgConfig)
 
-pkg_check_modules( odbc QUIET odbc )
-if(${odbc_FOUND})
-    set(HAS_ODBC 1)
-endif(${odbc_FOUND})
+if(WIN32)
+    CHECK_INCLUDE_FILE(sqlext.h HAS_ODBC)
+else()
+    include(FindPkgConfig)
+
+    pkg_check_modules( odbc QUIET odbc )
+    if(${odbc_FOUND})
+	set(HAS_ODBC 1)

Review comment:
       tabs vs. spaces as well.

##########
File path: src/CMakeLists.txt
##########
@@ -8,6 +8,12 @@ if(WIN32)
 # The ODBC appender is always enabled in the Windows configuration
 target_link_libraries(log4cxx PRIVATE odbc32.lib)
 option(LOG4CXX_INSTALL_PDB "Install .pdb files (if generated)"  ON)
+else()
+    if(${odbc_FOUND})
+	target_include_directories(log4cxx PRIVATE ${odbc_INCLUDE_DIRS})
+	target_link_directories( log4cxx PRIVATE ${odbc_LIBRARY_DIRS})
+	target_link_libraries( log4cxx PRIVATE ${odbc_LIBRARIES})

Review comment:
       These lines mixed tabs and spaces.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org