CMake: Implement final changes to allow for non-staging build

With this the cmake side supports building without staging the source files

Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>

Author: dnakamura

CMakeLists.txt

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2018, 2018 IBM Corp. and others
+# Copyright (c) 2018, 2019 IBM Corp. and others
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License 2.0 which accompanies this
@@ -38,9 +38,9 @@ else()
     include(FindJava)
 endif()
 
-# Note: these are temporary transition variables
-set(J9VM_GEN_NLS TRUE) # if true, generate nls headers from cmake
-set(J9VM_GEN_CP TRUE) # if true, generate constantpool files from cmake
+# Note: this is a temporary transition variable
+set(J9VM_IS_NON_STAGING TRUE)
+
 
 add_subdirectory(sourcetools)
 add_subdirectory(runtime)

runtime/CMakeLists.txt

@@ -51,7 +51,11 @@ endif()
 # Pull in definitions for omr_add_hookgen and omr_add_tracegen
 # these will be in omr/cmake/modules
 include(OmrHookgen)
-set(OMR_TRACE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
+if(J9VM_IS_NON_STAGING)
+	set(OMR_TRACE_ROOT "${CMAKE_CURRENT_BINARY_DIR}")
+else()
+	set(OMR_TRACE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
+endif()
 include(OmrTracegen)
 
 include(cmake/build_tags.cmake)
@@ -84,6 +88,14 @@ set(OMR_INSTALL_BIN_DIR "${j9vm_SOURCE_DIR}" CACHE PATH "")
 set(OMR_INSTALL_LIB_DIR "${j9vm_SOURCE_DIR}" CACHE PATH "")
 set(OMR_INSTALL_ARCHIVE_DIR "${j9vm_SOURCE_DIR}/lib" CACHE PATH "")
 
+# if this is a non-staging build, we want to put binaries in current source dir
+if(J9VM_IS_NON_STAGING)
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+	# we also want to set the RPATH properly
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+endif()
+
 # Generic configuration for omr
 include(cmake/omr_config.cmake)
 
@@ -122,7 +134,7 @@ add_custom_target(j9vm_hookgen
 )
 
 # Generate NLS headers
-if(J9VM_GEN_NLS)
+if(J9VM_IS_NON_STAGING)
 	add_custom_command(
 		OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/java.properties"
 		DEPENDS j9nls
@@ -160,6 +172,12 @@ add_custom_target(j9vm_m4gen
 		"${CMAKE_CURRENT_BINARY_DIR}/j9vm/generated.h"
 )
 
+if(J9VM_IS_NON_STAGING)
+	add_custom_target(copy_default_options ALL
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/options.default" "${CMAKE_CURRENT_BINARY_DIR}/options.default"
+	)
+endif()
+
 ###
 ### Helper interface libraries
 ###
@@ -174,9 +192,10 @@ target_include_directories(j9vm_interface
 		${J9VM_OMR_DIR}/include_core
 		${CMAKE_CURRENT_BINARY_DIR}/omr
 		${CMAKE_CURRENT_BINARY_DIR}
+		${CMAKE_BINARY_DIR}
 )
 
-if(J9VM_GEN_NLS)
+if(J9VM_IS_NON_STAGING)
 	target_include_directories(j9vm_interface INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/nls)
 else()
 	target_include_directories(j9vm_interface INTERFACE nls)

runtime/hyvm/CMakeLists.txt

@@ -41,7 +41,10 @@ target_link_libraries(harmony_jvm
 )
 
 # We actually want the library to be named "jvm.{so|dll}"
-set_target_properties(harmony_jvm PROPERTIES LIBRARY_OUTPUT_NAME "jvm")
+set_target_properties(harmony_jvm PROPERTIES
+	LIBRARY_OUTPUT_NAME "jvm"
+	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
 
 install(
 	TARGETS harmony_jvm

runtime/jcl/CMakeLists.txt

@@ -53,7 +53,7 @@ else()
 endif()
 
 # Generate constant pool files
-if(J9VM_GEN_CP)
+if(J9VM_IS_NON_STAGING)
 	set(CONST_POOL_OUT_DIR "${j9vm_BINARY_DIR}")
 
 	# List of files generated by J9VMCPTool
@@ -88,7 +88,7 @@ if(J9VM_GEN_CP)
 	add_custom_target(run_cptool
 		DEPENDS ${gen_constpool_files}
 	)
-	add_dependencies(jclse run_cptool)
+	add_dependencies(j9vm_interface run_cptool)
 	set(cp_file_name ${CONST_POOL_OUT_DIR}/j9vmconstantpool.c)
 	set_source_files_properties(${cp_file_name} PROPERTIES GENERATED TRUE)
 	target_sources(jclse PRIVATE ${cp_file_name})

runtime/redirector/CMakeLists.txt

@@ -42,7 +42,10 @@ target_include_directories(jvm_redirect
 		"${j9vm_SOURCE_DIR}/j9vm"
 		"${j9vm_BINARY_DIR}/j9vm"
 )
-set_target_properties(jvm_redirect PROPERTIES LIBRARY_OUTPUT_NAME jvm)
+set_target_properties(jvm_redirect PROPERTIES
+	LIBRARY_OUTPUT_NAME jvm
+	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
 
 install(
 	TARGETS jvm_redirect