Skip to content

Commit

Permalink
removing java wrapper from cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
stephen-dixon committed Jan 25, 2024
1 parent 2f7d61f commit a3f5a5c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ option( ENABLE_CAPNP "Enable Cap’n Proto serialisation" OFF )
option( NO_WRAPPERS "Don't build any UDA client wrappers" OFF )
option( NO_CXX_WRAPPER "Don't build C++ wrapper" OFF )
option( NO_PYTHON_WRAPPER "Don't build Python wrapper" OFF )
option( NO_JAVA_WRAPPER "Don't build Java wrapper" OFF )
option( NO_JAVA_WRAPPER "Don't build Java wrapper" ON )
option( NO_IDL_WRAPPER "Don't build IDL wrapper" OFF )
option( FAT_IDL "Build IDL wrapper using fat-client" OFF )

Expand Down
18 changes: 9 additions & 9 deletions source/wrappers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ else()
message( WARNING "IDL wrapper not being built due to CMake option NO_IDL_WRAPPER" )
endif()

if( NOT NO_JAVA_WRAPPER )
if( JAVA_FOUND AND JNI_FOUND )
add_subdirectory( java )
else()
message( WARNING "JAVA or JNI not found - not building Java wrapper" )
endif()
else()
message( WARNING "Java wrapper not being built due to CMake option NO_JAVA_WRAPPER" )
endif()
# if( NOT NO_JAVA_WRAPPER )
# if( JAVA_FOUND AND JNI_FOUND )
# add_subdirectory( java )
# else()
# message( WARNING "JAVA or JNI not found - not building Java wrapper" )
# endif()
# else()
# message( WARNING "Java wrapper not being built due to CMake option NO_JAVA_WRAPPER" )
# endif()

#add_subdirectory( matlab )
#add_subdirectory( PHP )

0 comments on commit a3f5a5c

Please sign in to comment.