Add J9VM_OPT_JITSERVER to j9cfg.h.in for cmake build system

Instead of adding -DJ9VM_OPT_JITSERVER, add it to j9cfg.h.in
so that cmake system can convert it to define or undef depending
on the env variable with same name.

Signed-off-by: Ashutosh Mehra <mehra.ashutosh@ibm.com>

runtime/CMakeLists.txt

@@ -105,9 +105,6 @@ include(cmake/omr_config.cmake)
 if(OPENJ9_BUILD)
 	add_definitions(-DOPENJ9_BUILD)
 endif()
-if (J9VM_OPT_JITSERVER)
-	add_definitions(-DJ9VM_OPT_JITSERVER)
-endif()
 
 # clean up the variables we used
 set(versionStr)

runtime/cmake/caches/common.cmake

@@ -196,6 +196,7 @@ set(J9VM_OPT_DYNAMIC_LOAD_SUPPORT ON CACHE BOOL "")
 set(J9VM_OPT_FRAGMENT_RAM_CLASSES ON CACHE BOOL "")
 set(J9VM_OPT_INLINE_JSRS ON CACHE BOOL "")
 set(J9VM_OPT_INVARIANT_INTERNING ON CACHE BOOL "")
+set(J9VM_OPT_JITSERVER OFF CACHE BOOL "Enable JITServer")
 set(J9VM_OPT_JVMTI ON CACHE BOOL "")
 set(J9VM_OPT_JXE_LOAD_SUPPORT ON CACHE BOOL "")
 set(J9VM_OPT_MEMORY_CHECK_SUPPORT ON CACHE BOOL "")

runtime/compiler/CMakeLists.txt

@@ -83,7 +83,6 @@ add_custom_target(j9jit_tracegen DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/env/ut_j9ji
 # J9VM_OPT_JITSERVER and protobuf
 if(J9VM_OPT_JITSERVER)
 	message(STATUS "JITServer is supported")
-	add_definitions(-DJ9VM_OPT_JITSERVER)
 
 	include(FindProtobuf)
 	set(Protobuf_USE_STATIC_LIBS ON)

runtime/compiler/runtime/CMakeLists.txt

@@ -62,7 +62,7 @@ j9jit_files(
 
 if(J9VM_OPT_JITSERVER)
 	j9jit_files(
-                runtime/CompileService.cpp
+		runtime/CompileService.cpp
 		runtime/JITClientSession.cpp
 		runtime/JITServerIProfiler.cpp
 		runtime/JITServerStatisticsThread.cpp

runtime/include/j9cfg.h.in

@@ -215,6 +215,7 @@ extern "C" {
 #cmakedefine J9VM_OPT_INLINE_JSRS
 #cmakedefine J9VM_OPT_INVARIANT_INTERNING
 #cmakedefine J9VM_OPT_JAVA_OFFLOAD_SUPPORT
+#cmakedefine J9VM_OPT_JITSERVER
 #cmakedefine J9VM_OPT_JVMTI
 #cmakedefine J9VM_OPT_JXE_LOAD_SUPPORT
 #cmakedefine J9VM_OPT_MEMORY_CHECK_SUPPORT