Avoid compiler flag for standard /usr/include

OpenModelica · Mar 13, 2016 · 93f2bfc · 93f2bfc
1 parent 12879a0
commit 93f2bfc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt b/SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt
@@ -122,7 +122,9 @@ ELSE(WIN32)
 	ELSE()
 		SET(Boost_LIBS_ ${Boost_LIBRARY_DIR})
 	ENDIF()
-	IF("${Boost_INCLUDE_DIR}" STREQUAL "")
+	IF("${Boost_INCLUDE_DIR}" STREQUAL "" OR
+	   "${Boost_INCLUDE_DIR}" STREQUAL "/usr/include")
+		# standard /usr/include collides with cross compilation
 		SET(Boost_INCLUDE_ ".")
 	ELSE()
 		SET(Boost_INCLUDE_ ${Boost_INCLUDE_DIR})
@@ -132,7 +134,9 @@ ELSE(WIN32)
 	ELSE()
 		SET(SUNDIALS_LIBS_ ${SUNDIALS_LIBS})
 	ENDIF()
-	IF("${SUNDIALS_INCLUDE_DIR}" STREQUAL "")
+	IF("${SUNDIALS_INCLUDE_DIR}" STREQUAL "" OR
+	   "${SUNDIALS_INCLUDE_DIR}" STREQUAL "/usr/include")
+		# standard /usr/include collides with cross compilation
 		SET(SUNDIALS_INCLUDE_DIR_ ".")
 	ELSE()
 		SET(SUNDIALS_INCLUDE_DIR_ ${SUNDIALS_INCLUDE_DIR})