comparison CMakeLists.txt @ 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 17ace5a879b2
comparison
equal deleted inserted replaced
7:37f25cb34196 8:c54fe2f77030
415 SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES PREFIX "") 415 SET_TARGET_PROPERTIES(${LIBNAME} PROPERTIES PREFIX "")
416 ENDIF() 416 ENDIF()
417 417
418 # RLM link jni the dumb way for now: 418 # RLM link jni the dumb way for now:
419 419
420 INCLUDE_DIRECTORIES("/opt/jdk/include/") 420 #INCLUDE_DIRECTORIES("/opt/jdk/include/")
421 INCLUDE_DIRECTORIES("/opt/jdk/include/linux") 421 #INCLUDE_DIRECTORIES("/opt/jdk/include/linux")
422 find_package (JNI REQUIRED)
423 if (JNI_FOUND)
424 include_directories(${JNI_INCLUDE_DIRS})
425 endif (JNI_FOUND)
426
422 TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS}) 427 TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
423 428
424 # Add an install target here 429 # Add an install target here
425 INSTALL(TARGETS ${LIBNAME} 430 INSTALL(TARGETS ${LIBNAME}
426 RUNTIME DESTINATION bin 431 RUNTIME DESTINATION bin