Fix unit test framework compiler flags

shogun-toolbox · Aug 17, 2016 · b997a73 · b997a73
1 parent 1649cf5
commit b997a73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CMakeLists.txt b/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}")

diff --git a/cmake/external/GoogleTestNMock.cmake b/cmake/external/GoogleTestNMock.cmake
@@ -2,7 +2,9 @@ MergeCFLAGS()
 GetCompilers()
 
 # TODO: set -fPIC only if needed
-SET(MERGED_CXX_FLAGS "${MERGED_CXX_FLAGS} -fPIC")
+IF (NOT MSVC)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ENDIF()
 
 SET (GMOCK_REVISION 443)
 include(ExternalProject)
@@ -16,7 +18,10 @@ ExternalProject_Add(
 	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_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}
 )