changeset 8:c54fe2f77030

made build process more robust
author Robert McIntyre <rlm@mit.edu>
date Thu, 27 Oct 2011 02:40:54 -0700
parents 37f25cb34196
children a988ea53d982
files CMakeLists.txt
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/CMakeLists.txt	Wed Oct 26 10:42:15 2011 -0700
     1.2 +++ b/CMakeLists.txt	Thu Oct 27 02:40:54 2011 -0700
     1.3 @@ -417,8 +417,13 @@
     1.4  
     1.5  # RLM link jni the dumb way for now:
     1.6  
     1.7 -INCLUDE_DIRECTORIES("/opt/jdk/include/")
     1.8 -INCLUDE_DIRECTORIES("/opt/jdk/include/linux")
     1.9 +#INCLUDE_DIRECTORIES("/opt/jdk/include/")
    1.10 +#INCLUDE_DIRECTORIES("/opt/jdk/include/linux")
    1.11 +find_package (JNI REQUIRED)
    1.12 +if (JNI_FOUND)
    1.13 +   include_directories(${JNI_INCLUDE_DIRS})
    1.14 +endif (JNI_FOUND)
    1.15 +
    1.16  TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
    1.17  
    1.18  # Add an install target here