- Linux CI

Author: janbender

CMake/Common.cmake

@@ -14,6 +14,16 @@ set(PBD_BINARY_MINSIZEREL_POSTFIX "_ms" CACHE INTERNAL "Postfix for executables"
 
 include(CMakeDependentOption)
 
+cmake_dependent_option(USE_PYTHON_BINDINGS "Generate Python Bindings using PyBind11" ON "PYTHON_EXECUTABLE" OFF)
+if (USE_PYTHON_BINDINGS AND UNIX)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+    message(STATUS "Adding -fPIC option when generating Python bindings using GCC")
+endif ()
+
+option(CI_BUILD "Build on CI System" OFF)
+mark_as_advanced(CI_BUILD)
+
 if (NOT WIN32)
 	if (NOT EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
 	  if (NOT CMAKE_BUILD_TYPE)
@@ -45,9 +55,14 @@ endif (MSVC)
 if (UNIX OR MINGW)
     set(CMAKE_USE_RELATIVE_PATHS "1")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
-    # Set compiler flags for "release"
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=native") 
+    # Set compiler flags for "release" Use generic 64 bit instructions when building on CI
+	if (CI_BUILD)
+		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64")
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=x86-64")
+	else()
+		set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native")
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=native")
+	endif ()
 endif (UNIX OR MINGW)
 if(MINGW)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1 -Wa,-mbig-obj")
@@ -67,10 +82,3 @@ OPTION(USE_DOUBLE_PRECISION "Use double precision"	ON)
 if (USE_DOUBLE_PRECISION)
 	add_definitions( -DUSE_DOUBLE)	
 endif (USE_DOUBLE_PRECISION)
-
-cmake_dependent_option(USE_PYTHON_BINDINGS "Generate Python Bindings using PyBind11" ON "PYTHON_EXECUTABLE" OFF)
-if (USE_PYTHON_BINDINGS AND UNIX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-    message(STATUS "Adding -fPIC option when generating Python bindings using GCC")
-endif ()