Merge branch 'develop'

merging master and develop after conditionning switch to custom gcc compiler on linux
bbercovici · Apr 27, 2018 · e863ce6 · e863ce6
2 parents 8cc65b5 + a52bb7e
commit e863ce6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Example/cmake/FindOmpGcc.cmake b/Example/cmake/FindOmpGcc.cmake
@@ -94,8 +94,11 @@ if(APPLE)
 	endif()
 
 else() 
-	# Running on Linux. Will switch back to compiler in /usr/local/bin
-	message("Switching to /usr/local/gcc ")
-	set(CMAKE_C_COMPILER "/usr/local/bin/gcc" CACHE STRING "C Compiler" FORCE)
-	set(CMAKE_CXX_COMPILER "/usr/local/bin/g++" CACHE STRING "C++ Compiler" FORCE)
+	# Running on Linux. May need to check for another compiler. If not found,
+	# will use default
+	if(EXISTS /usr/local/gcc)
+		message("Switching to /usr/local/gcc ")
+		set(CMAKE_C_COMPILER "/usr/local/bin/gcc" CACHE STRING "C Compiler" FORCE)
+		set(CMAKE_CXX_COMPILER "/usr/local/bin/g++" CACHE STRING "C++ Compiler" FORCE)
+	endif()
 endif()