Gabriel Petrovay has proposed merging lp:~gabipetrovay/zorba/formatting into
lp:zorba/email-module.
Requested reviews:
Gabriel Petrovay (gabipetrovay)
For more details, see:
https://code.launchpad.net/~gabipetrovay/zorba/formatting/+merge/78774
Formatting and usage of the new macro SET_CMAKE_MODULE_PATH
--
https://code.launchpad.net/~gabipetrovay/zorba/formatting/+merge/78774
Your team Zorba Coders is subscribed to branch lp:zorba/email-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2011-08-10 14:05:08 +0000
+++ CMakeLists.txt 2011-10-09 18:14:24 +0000
@@ -12,27 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
PROJECT (zorba_email_module)
ENABLE_TESTING ()
INCLUDE (CTest)
-IF (WIN32)
- # On Windows we use proxy modules that try to guess first the location
- # of the required third party libraries. This will search in order in:
- # 1. the path pointed by ZORBA_THIRD_PARTY_REQUIREMENTS
- # 2. the Program Files directory available on the users computer
- # 3. the PATH environment variable
- # The logic is implemented by the macros in the ProxyFindModule.cmake module.
- LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules/Windows")
-ENDIF (WIN32)
-LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
+SET_CMAKE_MODULE_PATH ()
FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
INCLUDE ("${Zorba_USE_FILE}")
-ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
-ADD_SUBDIRECTORY("src")
+ADD_TEST_DIRECTORY ("${PROJECT_SOURCE_DIR}/test")
+ADD_SUBDIRECTORY ("src")
-DONE_DECLARING_ZORBA_URIS()
+DONE_DECLARING_ZORBA_URIS ()
=== modified file 'cmake_modules/Windows/FindCClient.cmake'
--- cmake_modules/Windows/FindCClient.cmake 2011-08-19 00:03:41 +0000
+++ cmake_modules/Windows/FindCClient.cmake 2011-10-09 18:14:24 +0000
@@ -27,4 +27,8 @@
#
# See the FindCClient.cmake module shipped with Zorba for more information.
-FIND_PACKAGE_WIN32(NAME CClient FOUND_VAR CCLIENT_FOUND SEARCH_NAMES "imap;cclient;c-client")
+FIND_PACKAGE_WIN32 (
+ NAME "CClient"
+ FOUND_VAR "CCLIENT_FOUND"
+ SEARCH_NAMES "imap;cclient;c-client"
+)
=== modified file 'src/com/zorba-xquery/www/modules/email/cclient/imap_client.cpp'
--- src/com/zorba-xquery/www/modules/email/cclient/imap_client.cpp 2011-10-05 13:00:46 +0000
+++ src/com/zorba-xquery/www/modules/email/cclient/imap_client.cpp 2011-10-09 18:14:24 +0000
@@ -23,7 +23,9 @@
#include "email_exception.h"
+#ifndef WIN32
#pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
namespace zorba { namespace emailmodule {
@@ -69,7 +71,7 @@
}
else {
sprintf (tmp, "MAIL");
- res = smtp_mail(smtp_stream, tmp, aEnvelope, aBody);
+ res = smtp_mail(smtp_stream, tmp, aEnvelope, aBody) != 0;
if (res) {
out << "Ok.";
} else {
@@ -931,4 +933,6 @@
}
+#ifndef WIN32
#pragma GCC diagnostic warning "-Wwrite-strings"
+#endif
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
