Skip to content

Commit f306e54

Browse files
committed
Use include directory from JAVA_HOME instead of submodule
1 parent 89fa956 commit f306e54

File tree

5 files changed

+5
-19
lines changed

5 files changed

+5
-19
lines changed

.gitmodules

Lines changed: 0 additions & 4 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,6 @@ Additional dependencies for the full build:
5252
doas pkg install bash node npm-node18 llvm
5353
```
5454

55-
## Initializing the Git Submodule
56-
57-
This repository contains a [Submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules).
58-
59-
Before you start, make sure that the submodule is initialized:
60-
61-
```sh
62-
git submodule update --init --recursive
63-
```
64-
6555
## Build
6656

6757
Run one of the following files using
@@ -123,7 +113,6 @@ Overview of the folder structure of this repository:
123113
├── build* # Full C++ build output: x64 (and win32)
124114
├── target # Full Java build output including coverage report
125115
├── plc # PLC projects for the tests and samples
126-
├── jdk # OpenJDK submodule for the JNI header files
127116
```
128117

129118
## Contributing

cpp/.gitignore

Whitespace-only changes.

cpp/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ if (NOT WIN32)
4848
add_compile_definitions(POSIX)
4949
endif()
5050

51-
target_include_directories(AdsToJava PRIVATE "../jdk/src/java.base/share/native/include/")
51+
target_include_directories(AdsToJava PRIVATE "$ENV{JAVA_HOME}/include/")
5252
if (WIN32)
53-
target_include_directories(AdsToJava PRIVATE "../jdk/src/java.base/windows/native/include/")
53+
target_include_directories(AdsToJava PRIVATE "$ENV{JAVA_HOME}/include/win32/")
54+
elseif (EXISTS "$ENV{JAVA_HOME}/include/freebsd")
55+
target_include_directories(AdsToJava PRIVATE "$ENV{JAVA_HOME}/include/freebsd/")
5456
else()
55-
target_include_directories(AdsToJava PRIVATE "../jdk/src/java.base/unix/native/include/")
57+
target_include_directories(AdsToJava PRIVATE "$ENV{JAVA_HOME}/include/unix/")
5658
endif()
5759

5860
if (WIN32)

jdk

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)