Fix unit test framework compiler flags

CMakeLists.txt

@@ -190,8 +190,8 @@ IF(MSVC)
 	SET(CMAKE_CXX_FLAGS_RELEASE "/O2 ${RELEASE_COMPILER_FLAGS}")
 	SET(CMAKE_C_FLAGS_DISTRIBUTION "/Ot")
 	SET(CMAKE_CXX_FLAGS_DISTRIBUTION "/Ot")
-	SET(CMAKE_C_FLAGS_DEBUG "/DEBUG")
-	SET(CMAKE_CXX_FLAGS_DEBUG "/DEBUG")
+	SET(CMAKE_C_FLAGS_DEBUG "/DEBUG /Od")
+	SET(CMAKE_CXX_FLAGS_DEBUG "/DEBUG /Od")
 ELSE()
 	SET(CMAKE_C_FLAGS_RELEASE "-O3 ${RELEASE_COMPILER_FLAGS}")
 	SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${RELEASE_COMPILER_FLAGS}")

cmake/external/GoogleTestNMock.cmake

@@ -1,11 +1,29 @@
 MergeCFLAGS()
 GetCompilers()
 
-# TODO: set -fPIC only if needed
-SET(MERGED_CXX_FLAGS "${MERGED_CXX_FLAGS} -fPIC")
-
 SET (GMOCK_REVISION 443)
 include(ExternalProject)
+
+IF (MSVC)
+	SET (CUSTOM_CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
+		-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
+		-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}${CMAKE_DEFINITIONS}
+		-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
+		-DCMAKE_CXX_FLAGS_DISTRIBUTION:STRING=${CMAKE_CXX_FLAGS_DISTRIBUTION}
+		-DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}
+		-DCMAKE_C_COMPILER:STRING=${C_COMPILER}
+		-DCMAKE_CXX_COMPILER:STRING=${CXX_COMPILER}
+	)
+ELSE ()
+	SET(MERGED_CXX_FLAGS "${MERGED_CXX_FLAGS} -fPIC")
+	SET (CUSTOM_CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
+		-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
+		-DCMAKE_CXX_FLAGS:STRING=${MERGED_CXX_FLAGS}${CMAKE_DEFINITIONS}
+		-DCMAKE_C_COMPILER:STRING=${C_COMPILER}
+		-DCMAKE_CXX_COMPILER:STRING=${CXX_COMPILER}
+	)
+ENDIF()
+
 ExternalProject_Add(
 	GoogleMock
 	URL http://googlemock.googlecode.com/files/gmock-1.7.0.zip
@@ -14,11 +32,7 @@ ExternalProject_Add(
 	PREFIX ${CMAKE_BINARY_DIR}/GoogleMock
 	DOWNLOAD_DIR ${THIRD_PARTY_DIR}/GoogleMock
 	INSTALL_COMMAND ""
-	CMAKE_ARGS	-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
-		-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${THIRD_PARTY_DIR}/libs/gmock
-		-DCMAKE_CXX_FLAGS:STRING=${MERGED_CXX_FLAGS}${CMAKE_DEFINITIONS}
-		-DCMAKE_C_COMPILER:STRING=${C_COMPILER}
-		-DCMAKE_CXX_COMPILER:STRING=${CXX_COMPILER}
+	CMAKE_ARGS ${CUSTOM_CMAKE_ARGS}
 )
 
 # only when using svn repository