cmake: only link the graphical client with OpenMP

Author: illwieckz

CMakeLists.txt

@@ -922,7 +922,8 @@ if (BUILD_CLIENT)
         ExecutableName ${CLIENT_EXECUTABLE_NAME}
         ApplicationMain ${ENGINE_DIR}/client/ClientApplication.cpp
         Definitions ${Definitions}
-        CompileFlags ${WARNINGS}
+        CompileFlags ${WARNINGS};${OPENMP_FLAG}
+        LinkFlags ${OPENMP_FLAG}
         Files ${WIN_RC} ${BUILDINFOLIST} ${QCOMMONLIST} ${SERVERLIST} ${CLIENTBASELIST} ${CLIENTLIST}
         Libs ${LIBS_CLIENT} ${LIBS_CLIENTBASE} ${LIBS_ENGINE}
         Tests ${CLIENTTESTLIST}

cmake/DaemonFlags.cmake

@@ -272,9 +272,11 @@ if (MSVC)
     endif()
 
 	if (NOT NACL AND BUILD_CLIENT AND USE_OPENMP)
-		try_cxx_flag(OPENMP "/openmp")
+		check_CXX_compiler_flag("/openmp" FLAG_OPENMP)
 
-		if (NOT FLAG_OPENMP)
+		if (FLAG_OPENMP)
+			set(OPENMP_FLAG "/openmp")
+		else()
 			message(WARNING "Missing OpenMP")
 		endif()
 	endif()
@@ -375,9 +377,11 @@ else()
 	endif()
 
 	if (NOT NACL AND BUILD_CLIENT AND USE_OPENMP)
-		try_cxx_flag(FOPENMP "-fopenmp")
+		check_CXX_compiler_flag("-fopenmp" FLAG_FOPENMP)
 
-		if (NOT FLAG_FOPENMP)
+		if (FLAG_FOPENMP)
+			set(OPENMP_FLAG "-fopenmp")
+		else()
 			message(WARNING "Missing OpenMP")
 		endif()
 	endif()

src.cmake

@@ -188,8 +188,6 @@ set(ENGINELIST
     ${ENGINE_DIR}/framework/CvarSystem.h
     ${ENGINE_DIR}/framework/LogSystem.cpp
     ${ENGINE_DIR}/framework/LogSystem.h
-    ${ENGINE_DIR}/framework/OmpSystem.cpp
-    ${ENGINE_DIR}/framework/OmpSystem.h
     ${ENGINE_DIR}/framework/Resource.cpp
     ${ENGINE_DIR}/framework/Resource.h
     ${ENGINE_DIR}/framework/System.cpp
@@ -209,6 +207,11 @@ set(ENGINELIST
     ${ENGINE_DIR}/RefAPI.h
 )
 
+set(OMPLIST
+    ${ENGINE_DIR}/framework/OmpSystem.cpp
+    ${ENGINE_DIR}/framework/OmpSystem.h
+)
+
 if (WIN32)
     set(ENGINELIST ${ENGINELIST}
         ${ENGINE_DIR}/sys/con_passive.cpp
@@ -221,6 +224,7 @@ endif()
 
 # Tests runnable for any engine variant
 set(ENGINETESTLIST ${COMMONTESTLIST}
+    ${OMPLIST}
     ${ENGINE_DIR}/framework/CommandSystemTest.cpp
 )
 
@@ -273,6 +277,7 @@ set(CLIENTBASELIST
 )
 
 set(CLIENTLIST
+    ${OMPLIST}
     ${ENGINE_DIR}/audio/ALObjects.cpp
     ${ENGINE_DIR}/audio/ALObjects.h
     ${ENGINE_DIR}/audio/Audio.cpp
@@ -306,13 +311,15 @@ set(CLIENTTESTLIST ${ENGINETESTLIST}
 )
 
 set(TTYCLIENTLIST
+    ${OMPLIST}
     ${ENGINE_DIR}/null/NullAudio.cpp
     ${ENGINE_DIR}/null/NullKeyboard.cpp
     ${ENGINE_DIR}/null/null_input.cpp
     ${ENGINE_DIR}/null/null_renderer.cpp
 )
 
 set(DEDSERVERLIST
+    ${OMPLIST}
     ${ENGINE_DIR}/null/NullKeyboard.cpp
     ${ENGINE_DIR}/null/null_client.cpp
     ${ENGINE_DIR}/null/null_input.cpp