fix for PrecompiledHeader and msvc build in cpp runtime

OpenModelica · Nov 30, 2015 · 150aaf3 · 150aaf3
1 parent 9638dc4
commit 150aaf3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/SimulationRuntime/cpp/PrecompiledHeader.cmake b/SimulationRuntime/cpp/PrecompiledHeader.cmake
@@ -50,6 +50,7 @@ FOREACH(arg ${ARGN})
 ENDFOREACH(arg)
 
 IF(MSVC)
+	MESSAGE(STATUS "create pch for msvc with compile flags: ${CMAKE_CXX_FLAGS}" )
 	GET_FILENAME_COMPONENT(_name ${_input} NAME)
 	GET_TARGET_PROPERTY(sources ${_targetName} SOURCES)
 	SET(_sourceFound FALSE)
@@ -82,7 +83,7 @@ IF(MSVC)
 					ENDIF(FORCEINCLUDE)
 				ENDIF(_sourceWe STREQUAL ${_inputWe})
 				SET_SOURCE_FILES_PROPERTIES(${_source} PROPERTIES COMPILE_FLAGS "${PCH_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS}")
-                MESSAGE(STATUS "set source file properties for: ${_source} ${PCH_COMPILE_FLAGS} " )
+                MESSAGE(STATUS "set source file properties for: ${_source} ${PCH_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS}" )
 			ENDIF(_source MATCHES \\.\(cc|cxx|cpp\)$)
 		ENDFOREACH()
 		IF(NOT _sourceFound)
@@ -96,8 +97,9 @@ IF(MSVC)
 	ENDIF(CMAKE_BUILD_TYPE MATCHES RELEASE)
 	GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
 	#LIST(APPEND _compiler_FLAGS ${_directory_flags})
-	SET(_compiler_FLAGS "${_compiler_FLAGS} ${_directory_flags}")
+	SET(_compiler_FLAGS "${CMAKE_CXX_FLAGS} ${_directory_flags}")
 	SET(SYSTEM_CFLAGS ${_compiler_FLAGS})
+	MESSAGE(STATUS "SYSTEM_CFLAGS: ${CMAKE_CXX_FLAGS}" )
 ENDIF(MSVC)
 
 IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"  OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")