Merge pull request #7073 from dnakamura/zos_includes

CMake: update include paths for z/OS
eclipse-openj9 · Sep 16, 2019 · f0b728b · f0b728b
2 parents c370981 + 08619bc
commit f0b728b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/runtime/gc_modron_startup/CMakeLists.txt b/runtime/gc_modron_startup/CMakeLists.txt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2017, 2018 IBM Corp. and others
+# Copyright (c) 2017, 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
@@ -37,6 +37,12 @@ target_include_directories(j9modronstartup
 	PUBLIC
 		.
 )
+if(OMR_OS_ZOS)
+	target_include_directories(j9modronstartup
+		PRIVATE
+			"${omr_SOURCE_DIR}/port/zos390"
+	)
+endif()
 target_link_libraries(j9modronstartup
 	PRIVATE
 		j9vm_interface

diff --git a/runtime/redirector/CMakeLists.txt b/runtime/redirector/CMakeLists.txt
@@ -42,6 +42,12 @@ target_include_directories(jvm_redirect
 		"${j9vm_SOURCE_DIR}/j9vm"
 		"${j9vm_BINARY_DIR}/j9vm"
 )
+if(OMR_OS_ZOS)
+	target_include_directories(jvm_redirect
+		PRIVATE
+			"${omr_SOURCE_DIR}/port/zos390"
+	)
+endif()
 set_target_properties(jvm_redirect PROPERTIES
 	LIBRARY_OUTPUT_NAME jvm
 	LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"