Changeset 50 in pacpusframework for trunk/cmake/Findlog4cxx.cmake

Timestamp:

01/09/13 09:06:15 (11 years ago)

Author:

Marek Kurdej

Message:

CMake: updated to conform to the coding style.

File:

• trunk/cmake/Findlog4cxx.cmake (modified) (2 diffs)

trunk/cmake/Findlog4cxx.cmake

@@ -12 +12 @@
 ################################################################################
 
-INCLUDE (FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 
 # See if LOG4CXX_ROOT is not already set in CMake
-IF (NOT LOG4CXX_ROOT)
+if(NOT LOG4CXX_ROOT)
     # See if LOG4CXX_ROOT is set in process environment
-    IF ( NOT $ENV{LOG4CXX_ROOT} STREQUAL "" )
-        SET (LOG4CXX_ROOT "$ENV{LOG4CXX_ROOT}")
-        MESSAGE (STATUS "Detected LOG4CXX_ROOT set to '${LOG4CXX_ROOT}'")
-    ENDIF ()
-ENDIF ()
+    if( NOT $ENV{LOG4CXX_ROOT} STREQUAL "" )
+        SET(LOG4CXX_ROOT "$ENV{LOG4CXX_ROOT}")
+        MESSAGE(STATUS "Detected LOG4CXX_ROOT set to '${LOG4CXX_ROOT}'")
+    endif()
+endif()
 
-SET (LOG4CXX_INC_LIST
-  "/usr/include"
-  "/usr/local/include"
+set(LOG4CXX_INC_LIST
+    "/usr/include"
+    "/usr/local/include"
 )
 
-SET (LOG4CXX_LIB_LIST
-  "/usr/lib"
-  "/usr/local/lib"
+set(LOG4CXX_LIB_LIST
+    "/usr/lib"
+    "/usr/local/lib"
 )
 
 # If LOG4CXX_ROOT is available, set up our hints
-IF (LOG4CXX_ROOT)
+if(LOG4CXX_ROOT)
     # Includes
-    LIST (APPEND LOG4CXX_INC_LIST
+    list(APPEND LOG4CXX_INC_LIST
       "${LOG4CXX_ROOT}/include"
       "${LOG4CXX_ROOT}"
     )
 
-    # Libraries (win32)
-    IF (MSVC)
-      # Visual Studio 2008
-      IF (MSVC9)
-        LIST (APPEND LOG4CXX_LIB_LIST "${LOG4CXX_ROOT}/lib/msvc2008")
-      ENDIF ()
-      # Visual Studio 2010
-      IF (MSVC10)
-        LIST (APPEND LOG4CXX_LIB_LIST "${LOG4CXX_ROOT}/lib/msvc2010")
-      ENDIF ()
-    ENDIF ()
+    # Libraries win32
+    if(MSVC)
+        # Visual Studio 2008
+        if(MSVC9)
+            list(APPEND LOG4CXX_LIB_LIST "${LOG4CXX_ROOT}/lib/msvc2008")
+        endif()
+        # Visual Studio 2010
+        if(MSVC10)
+            list(APPEND LOG4CXX_LIB_LIST "${LOG4CXX_ROOT}/lib/msvc2010")
+        endif()
+    endif()
 
-    # Libraries (all)
-    LIST (APPEND LOG4CXX_LIB_LIST "${LOG4CXX_ROOT}/lib")
-ENDIF ()
+    # Libraries all
+    list(APPEND LOG4CXX_LIB_LIST "${LOG4CXX_ROOT}/lib")
+endif()
 
 # Find headers
-FIND_PATH (
-  LOG4CXX_INCLUDE_DIR
-  NAMES
-    log4cxx/log4cxx.h
-  HINTS
-    ${LOG4CXX_INC_LIST}
+find_path(
+    LOG4CXX_INCLUDE_DIR
+    NAMES
+        log4cxx/log4cxx.h
+    HINTS
+        ${LOG4CXX_INC_LIST}
 )
 
 # Find release library
-FIND_LIBRARY (
-  LOG4CXX_LIBRARY
-  NAMES
-    log4cxx
-  HINTS
-    ${LOG4CXX_LIB_LIST}
+find_library(
+    LOG4CXX_LIBRARY
+    NAMES
+        log4cxx
+    HINTS
+        ${LOG4CXX_LIB_LIST}
 )
 
 # Find debug library, if on UNIX this is the same as release
-IF (WIN32)
-  FIND_LIBRARY (LOG4CXXD_LIBRARY NAMES log4cxx_d HINTS ${LOG4CXX_LIB_LIST})
-ELSE ()
-  SET (LOG4CXXD_LIBRARY ${LOG4CXX_LIBRARY})
-ENDIF ()
+if(WIN32)
+    find_library(LOG4CXXD_LIBRARY NAMES log4cxx_d HINTS ${LOG4CXX_LIB_LIST})
+else()
+    set(LOG4CXXD_LIBRARY ${LOG4CXX_LIBRARY})
+endif()
 
 # Set LOG4CXX_FOUND honoring the QUIET and REQUIRED arguments
@@ -86 +86 @@
 
 # Output variables
-SET (LOG4CXX_LIBRARIES "")
-IF (LOG4CXX_FOUND)
-  # Include dirs
-  SET (LOG4CXX_INCLUDE_DIRS ${LOG4CXX_INCLUDE_DIR})
+set(LOG4CXX_LIBRARIES "")
+if(LOG4CXX_FOUND)
+    # Include dirs
+    set(LOG4CXX_INCLUDE_DIRS ${LOG4CXX_INCLUDE_DIR})
 
-  # Release Libraries
-  IF (LOG4CXX_LIBRARY)
-    LIST(APPEND LOG4CXX_LIBRARIES optimized ${LOG4CXX_LIBRARY})
-  ENDIF ()
-  
-  # Debug Libraries
-  IF(LOG4CXXD_LIBRARY)
-    LIST(APPEND LOG4CXX_LIBRARIES debug ${LOG4CXXD_LIBRARY})
-  ENDIF()
+    # Release Libraries
+    if(LOG4CXX_LIBRARY)
+        LIST(APPEND LOG4CXX_LIBRARIES optimized ${LOG4CXX_LIBRARY})
+    endif()
 
-  # Link dirs
-  GET_FILENAME_COMPONENT (LOG4CXX_LIBRARY_DIRS ${LOG4CXX_LIBRARY} PATH)
-ENDIF ()
+    # Debug Libraries
+    if(LOG4CXXD_LIBRARY)
+        LIST(APPEND LOG4CXX_LIBRARIES debug ${LOG4CXXD_LIBRARY})
+    endif()
+
+    # Link dirs
+    get_filename_component(LOG4CXX_LIBRARY_DIRS ${LOG4CXX_LIBRARY} PATH)
+endif()
 
 # Advanced options for not cluttering the cmake UIs
-MARK_AS_ADVANCED (LOG4CXX_INCLUDE_DIR LOG4CXX_LIBRARY)
+mark_as_advanced(LOG4CXX_INCLUDE_DIR LOG4CXX_LIBRARY)