Merge branch 'log4qt-install-step-is-optional'

* log4qt-install-step-is-optional:
  Install step associated with Log4Qt is optional

CMakeExternals/Log4Qt.cmake

@@ -26,14 +26,14 @@ IF(${add_project})
       GIT_REPOSITORY "${git_protocol}://github.com/commontk/Log4Qt.git"
       GIT_TAG "origin/patched"
       CMAKE_GENERATOR ${gen}
-      BUILD_COMMAND ""
+      INSTALL_COMMAND ""
       CMAKE_ARGS
         ${ep_common_args}
         -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
       DEPENDS
         ${proj_DEPENDENCIES}
       )
-    SET(Log4Qt_DIR ${ep_install_dir})
+    SET(Log4Qt_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
     
     # Since Log4Qt is statically build, there is not need to add its corresponding 
     # library output directory to CTK_EXTERNAL_LIBRARY_DIRS

Libs/Core/CMakeLists.txt

@@ -1,5 +1,10 @@
 PROJECT(CTKCore)
 
+#
+# 3rd party dependencies
+#
+INCLUDE(${Log4Qt_USE_FILE})
+
 # CMake modules
 SET(CMAKE_MODULE_PATH ${CTKCore_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH})
 

Utilities/CMake/FindLog4Qt.cmake

@@ -1,31 +0,0 @@
-#  Log4Qt_INCLUDE_DIR   - Directories to include to use log4qt
-#  Log4Qt_LIBRARIES     - Files to link against to use log4qt
-#  Log4Qt_FOUND         - If false, don't try to use log4qt
-
-IF( NOT Log4Qt_FOUND )
-  SET( Log4Qt_DIR "/usr/include/log4qt/"
-    CACHE PATH "Root of Log4Qt source tree (optional)." )
-  MARK_AS_ADVANCED(Log4Qt_DIR)
-ENDIF()
-
-FIND_PATH(Log4Qt_category_INCLUDE_DIR log4qt.h
-  PATHS
-    ${Log4Qt_DIR}/include/log4qt
-  NO_DEFAULT_PATH
-)
-
-FIND_LIBRARY(Log4Qt_LIBRARIES Log4Qt
-  PATHS
-    ${Log4Qt_DIR}/
-    ${Log4Qt_DIR}/Release
-    ${Log4Qt_DIR}/Debug
-    ${Log4Qt_DIR}/lib/Release
-    ${Log4Qt_DIR}/lib/Debug
-    ${Log4Qt_DIR}/lib
-  NO_DEFAULT_PATH
-)
-
-if(Log4Qt_category_INCLUDE_DIR AND Log4Qt_LIBRARIES)
-  set(Log4Qt_INCLUDE_DIR ${Log4Qt_DIR}/include ${Log4Qt_DIR}/src)
-  set(Log4Qt_FOUND "YES" )
-endif()