Changed 'UNIX' to 'NOT MSVC'

Seems to work better with MinGW/MSYS

Author: j0r1

CMakeLists.txt

@@ -141,31 +141,31 @@ else (JRTPLIB_STDINT)
 	if (JRTPLIB_INTTYPES)
 		set(RTP_INTTYPE_HEADERS "#include <inttypes.h>\n#include <sys/types.h>\n")
 	else (JRTPLIB_INTTYPES)
-		if (NOT UNIX AND WIN32)
+		if (MSVC)
 			set(RTP_INTTYPE_HEADERS "#include \"rtptypes_win.h\"")
-		else (NOT UNIX AND WIN32)
+		else (MSVC)
 			set(RTP_INTTYPE_HEADERS "#error Could not find header files that define types like 'uint32_t'. Please edit the file ${PROJECT_BINARY_DIR}/src/rtptypes_unix.h and make sure that the following types are defined: int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t")
 			message("\n\nError: Could not find header files that define types like 'uint32_t'.\nPlease edit the file ${PROJECT_BINARY_DIR}/src/rtptypes_unix.h\nand make sure that the following types are defined: \nint8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t\n\n")
-		endif (NOT UNIX AND WIN32)
+		endif (MSVC)
 	endif (JRTPLIB_INTTYPES)
 endif (JRTPLIB_STDINT)
 
 if (RTP_SOCKETTYPE_WINSOCK)
     set(RTP_WINSOCK_HEADERS "#ifdef RTP_SOCKETTYPE_WINSOCK\n	#include <winsock2.h>	\n	#include <ws2tcpip.h>\n#ifndef _WIN32_WCE\n	#include <sys/types.h>\n#endif // _WIN32_WCE\n#endif // RTP_SOCKETTYPE_WINSOCK\n")
 endif (RTP_SOCKETTYPE_WINSOCK)
 
-if (NOT UNIX)
+if (MSVC)
 	set(JRTPLIB_COMPILE_STATIC ON CACHE BOOL "Flag indicating if a static library should be built, or a dynamic one")
 	list(APPEND JRTPLIB_LINK_LIBS "ws2_32")
-endif (NOT UNIX)
+endif ()
 
-if (UNIX OR JRTPLIB_COMPILE_STATIC)
+if (NOT MSVC OR JRTPLIB_COMPILE_STATIC)
 	set(JRTPLIB_IMPORT "")
 	set(JRTPLIB_EXPORT "")
-else (UNIX OR JRTPLIB_COMPILE_STATIC)
+else ()
 	set(JRTPLIB_IMPORT "__declspec(dllimport)")
 	set(JRTPLIB_EXPORT "__declspec(dllexport)")
-endif (UNIX OR JRTPLIB_COMPILE_STATIC)
+endif ()
 
 configure_file("${PROJECT_SOURCE_DIR}/src/rtptypes.h.in" "${PROJECT_BINARY_DIR}/src/rtptypes.h")
 configure_file("${PROJECT_SOURCE_DIR}/src/rtpconfig.h.in" "${PROJECT_BINARY_DIR}/src/rtpconfig.h")
@@ -180,12 +180,12 @@ if (JRTPLIB_COMPILE_TESTS)
 	add_subdirectory(tests)
 endif()
 
-if (UNIX)
+if (NOT MSVC)
 	set(JRTPLIB_LIBS "-L${LIBRARY_INSTALL_DIR}" "-ljrtp")
-else (UNIX)
+else ()
 	set(JRTPLIB_LIBS optimized "${LIBRARY_INSTALL_DIR}/jrtplib.lib" 
 		         debug "${LIBRARY_INSTALL_DIR}/jrtplib_d.lib")
-endif (UNIX)
+endif ()
 
 set(JRTPLIB_INCDIRS ${JRTPLIB_EXTERNAL_INCLUDES} ${CMAKE_INSTALL_PREFIX}/include)
 set(JRTPLIB_LIBS ${JRTPLIB_LIBS} ${JRTPLIB_LINK_LIBS})
@@ -203,7 +203,7 @@ endforeach()
 configure_file("${PROJECT_SOURCE_DIR}/cmake/JRTPLIBConfig.cmake.in" "${PROJECT_BINARY_DIR}/cmake/JRTPLIBConfig.cmake")
 install(FILES "${PROJECT_BINARY_DIR}/cmake/JRTPLIBConfig.cmake" DESTINATION ${LIBRARY_INSTALL_DIR}/cmake/JRTPLIB)
 
-if (UNIX)
+if (NOT MSVC)
 	foreach(ARG ${JRTPLIB_LIBS})
 		set(JRTPLIB_LIBS_PKGCONFIG "${JRTPLIB_LIBS_PKGCONFIG} ${ARG}")
 	endforeach()
@@ -213,6 +213,6 @@ if (UNIX)
 
 	configure_file(${PROJECT_SOURCE_DIR}/pkgconfig/jrtplib.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/jrtplib.pc)
 	install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/jrtplib.pc DESTINATION ${LIBRARY_INSTALL_DIR}/pkgconfig)
-endif (UNIX)
+endif ()
 
 

examples/CMakeLists.txt

@@ -3,7 +3,7 @@ apply_include_paths("${JRTPLIB_EXTERNAL_INCLUDES}")
 
 foreach(IDX 1 2 3 4 5 6 7 8)
 	add_executable(example${IDX} example${IDX}.cpp)
-	if (UNIX OR JRTPLIB_COMPILE_STATIC)
+	if (NOT MSVC OR JRTPLIB_COMPILE_STATIC)
 		target_link_libraries(example${IDX} jrtplib-static)
 	else ()
 		target_link_libraries(example${IDX} jrtplib-shared)

src/CMakeLists.txt

@@ -103,12 +103,12 @@ set(SOURCES
 	rtptcptransmitter.cpp
 	)
 
-if (UNIX)
+if (NOT MSVC)
 	set (SOURCES ${SOURCES} extratransmitters/rtpfaketransmitter.cpp )
 	set (HEADERS ${HEADERS} extratransmitters/rtpfaketransmitter.h )
-else (UNIX)
+else ()
 	set(CMAKE_DEBUG_POSTFIX _d)
-endif (UNIX)
+endif ()
 
 # Enable extra compiler warnings and mark warnings as errors: -Wall -Wextra -Werror
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
@@ -118,30 +118,30 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
 	endif ()
 endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
 
-if (UNIX OR JRTPLIB_COMPILE_STATIC)
+if (NOT MSVC OR JRTPLIB_COMPILE_STATIC)
 	add_library(jrtplib-static STATIC ${SOURCES} ${HEADERS})
-	if (UNIX)
+	if (NOT MSVC)
 		set_target_properties(jrtplib-static PROPERTIES OUTPUT_NAME jrtp)
-	else (UNIX)
+	else ()
 		set_target_properties(jrtplib-static PROPERTIES OUTPUT_NAME jrtplib)
-	endif(UNIX)
+	endif()
 	set_target_properties(jrtplib-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 	set(JRTPLIB_INSTALLTARGETS jrtplib-static)
 	target_link_libraries(jrtplib-static ${JRTPLIB_LINK_LIBS})
-endif (UNIX OR JRTPLIB_COMPILE_STATIC)
+endif (NOT MSVC OR JRTPLIB_COMPILE_STATIC)
 
-if (UNIX OR NOT JRTPLIB_COMPILE_STATIC)
+if (NOT MSVC OR NOT JRTPLIB_COMPILE_STATIC)
 	add_library(jrtplib-shared SHARED ${SOURCES} ${HEADERS})
-	if (UNIX)
+	if (NOT MSVC)
 		set_target_properties(jrtplib-shared PROPERTIES OUTPUT_NAME jrtp)
-	else (UNIX)
+	else ()
 		set_target_properties(jrtplib-shared PROPERTIES OUTPUT_NAME jrtplib)
-	endif(UNIX)
+	endif()
 	set_target_properties(jrtplib-shared PROPERTIES VERSION ${VERSION})
 	set_target_properties(jrtplib-shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 	set(JRTPLIB_INSTALLTARGETS ${JRTPLIB_INSTALLTARGETS} jrtplib-shared)
 	target_link_libraries(jrtplib-shared ${JRTPLIB_LINK_LIBS})
-endif (UNIX OR NOT JRTPLIB_COMPILE_STATIC)
+endif (NOT MSVC OR NOT JRTPLIB_COMPILE_STATIC)
 
 apply_include_paths("${JRTPLIB_INTERNAL_INCLUDES}")
 apply_include_paths("${JRTPLIB_EXTERNAL_INCLUDES}")

tests/CMakeLists.txt

@@ -4,7 +4,7 @@ apply_include_paths("${JRTPLIB_EXTERNAL_INCLUDES}")
 foreach(T testmultiplex testexistingsockets testautoportbase srtptest rtcpdump readlogfile
 	  timetest timeinittest abortdesctest abortdescipv6 tcptest)
 	add_executable(${T} ${T}.cpp)
-	if (UNIX OR JRTPLIB_COMPILE_STATIC)
+	if (NOT MSVC OR JRTPLIB_COMPILE_STATIC)
 		target_link_libraries(${T} jrtplib-static)
 	else ()
 		target_link_libraries(${T} jrtplib-shared)