diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt
index 2981011c769bb481579b13170b361977e068984c..b0e9d42e46f2b13b8faf12e7493c50be0041f7a1 100644
--- a/spectrum/src/CMakeLists.txt
+++ b/spectrum/src/CMakeLists.txt
@@ -7,7 +7,7 @@ ADD_DEPENDENCIES(spectrum2 spectrum2_libpurple_backend)
 ADD_DEPENDENCIES(spectrum2 spectrum2_libircclient-qt_backend)
 
 target_link_libraries(spectrum2 transport ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
-if (WIN32)
+if (NOT CMAKE_COMPILER_IS_GNUCXX)
 	target_link_libraries(spectrum2 libprotobuf)
 endif()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f739c45f01e42f2342f441ff086c1ba7dab4af1a..c3e301da2b07b2ab87eafa2835ec948073b7adf6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,11 +27,11 @@ endif()
 
 
 if (PROTOBUF_FOUND)
-	if (CMAKE_COMPILER_IS_GNUCXX)
+	if (NOT WIN32)
 		ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
-	else(CMAKE_COMPILER_IS_GNUCXX)
+	else()
 		ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC})
-	endif(CMAKE_COMPILER_IS_GNUCXX)
+	endif()
 #	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
 	ADD_DEPENDENCIES(transport pb) 
 else(PROTOBUF_FOUND)