Improve CMake builds.

1. Updated test target by utilizing CMAKE_RUNTIME_OUTPUT_DIRECTORY variable.
2. Updated cpack to pick up the LICENSE.
3. Added 'S' prefix for static libs.

Patch provided by: Sergey Nikulov <snikulov at users dot sourceforge dot net>

Author: wilx

CMakeLists.txt

@@ -42,6 +42,11 @@ option(WITH_ICONV "Use iconv() for char->wchar_t conversion."
 
 set(_WIN32_WINNT 0x0500 CACHE STRING "Define Windows API version to use.")
 
+if (NOT ${BUILD_SHARED_LIBS})
+  # set S-prefix for static build 
+  set (log4cplus_postfix "${log4cplus_postfix}S")
+endif()    
+
 if (UNICODE)
   set (log4cplus_postfix "${log4cplus_postfix}U")
 endif (UNICODE)
@@ -63,6 +68,8 @@ include_directories (${log4cplus_SOURCE_DIR}/include
                      ${log4cplus_BINARY_DIR}/include
                     )
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+
 if (LOG4CPLUS_BUILD_TESTING)
   enable_testing()
 endif (LOG4CPLUS_BUILD_TESTING)

Log4CPlusCPack.cmake

@@ -1,6 +1,6 @@
 set(CPACK_PACKAGE_NAME log4cplus)
 set(CPACK_PACKAGE_VERSION "${log4cplus_version_major}.${log4cplus_version_minor}.${log4cplus_version_patch}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "log4cplus is a log4j-inspired logging library for C++")
-
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
 include(CPack)
 

tests/CMakeLists.txt

@@ -12,7 +12,7 @@ function(log4cplus_add_test _name)
 #  message (STATUS "${_name} sources: ${_srcs}")
   add_executable (${_name} ${_srcs})
   target_link_libraries (${_name} ${log4cplus})
-  add_test(${_name} ${_name})
+  add_test(NAME ${_name} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${_name})
 endfunction()