OS/X and Windows build fixes

CMakeLists.txt

@@ -62,6 +62,12 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ENDIF()
 ENDIF()
 
+IF(WIN32)
+  ADD_DEFINITIONS(-DWIN32 -D_WINDOWS -D_CRT_SECURE_NO_DEPRECATE)
+ELSIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  ADD_DEFINITIONS(-DOSX)
+ENDIF()
+
 ## build options
 SET(PAHO_WITH_SSL FALSE CACHE BOOL "Flag that defines whether to build ssl-enabled binaries too. ")
 SET(PAHO_BUILD_STATIC FALSE CACHE BOOL "Build static library")

appveyor.yml

@@ -15,4 +15,9 @@ build_script:
 
     nmake
 
+    ctest -T test -VV
+
     cd ..
+
+test:
+  assemblies: build/Testing/*/Test.xml

cbuild.bat

@@ -11,6 +11,8 @@ cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=FALSE -DPAHO_BUILD_DOCUMENTATION=FALS
 
 nmake
 
+ctest -T test -VV
+
 cd ..
 
 endlocal

src/CMakeLists.txt

@@ -28,10 +28,6 @@ CONFIGURE_FILE(VersionInfo.h.in
     @ONLY
     )
 
-IF (WIN32)
-  	ADD_DEFINITIONS(/DCMAKE_BUILD /D_CRT_SECURE_NO_DEPRECATE)
-ENDIF()
-
 IF (PAHO_WITH_SSL)
     SET(OPENSSL_LIB_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL libraries")
     SET(OPENSSL_INC_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL includes")
@@ -96,15 +92,6 @@ ENDIF()
 ## common compilation for libpaho-mqtt3c and libpaho-mqtt3a
 ADD_LIBRARY(common_obj OBJECT ${common_src})
 SET_PROPERTY(TARGET common_obj PROPERTY POSITION_INDEPENDENT_CODE ON)
-IF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-  SET_PROPERTY(TARGET common_obj PROPERTY
-    COMPILE_DEFINITIONS "OSX=1")
-ENDIF ()
-## IF (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-##  MESSAGE(STATUS "Setting secure_no_warnings")
-##  SET_PROPERTY(TARGET common_obj PROPERTY
-##    COMPILE_DEFINITIONS "_CRT_SECURE_NO_DEPRECATE")
-## ENDIF ()
 
 ADD_EXECUTABLE(MQTTVersion MQTTVersion.c)
 
@@ -175,7 +162,7 @@ IF (PAHO_WITH_SSL)
     IF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
       SET_PROPERTY(TARGET common_ssl_obj PROPERTY COMPILE_DEFINITIONS "OPENSSL=1;OSX=1")
     ELSIF (WIN32)
-        SET_PROPERTY(TARGET common_ssl_obj PROPERTY COMPILE_DEFINITIONS "OPENSSL=1;_CRT_SECURE_NO_WARNINGS")
+        SET_PROPERTY(TARGET common_ssl_obj PROPERTY COMPILE_DEFINITIONS "OPENSSL=1")
     ELSE ()
       SET_PROPERTY(TARGET common_ssl_obj PROPERTY COMPILE_DEFINITIONS "OPENSSL=1")
     ENDIF ()

test/CMakeLists.txt

@@ -5,11 +5,6 @@ SET(MQTT_TEST_PROXY "tcp://localhost:1884" CACHE STRING "Hostname of the test pr
 SET(MQTT_SSL_HOSTNAME "localhost" CACHE STRING "Hostname of a test SSL MQTT broker to use")
 SET(CERTDIR $ENV{TRAVIS_BUILD_DIR}/test/ssl )
 
-IF (WIN32)
-	ADD_DEFINITIONS(/DCMAKE_BUILD /D_CRT_SECURE_NO_WARNINGS)
-ENDIF()
-
-
 ADD_EXECUTABLE(
 	test1
 	test1.c