A couple typos found by codespell

[openjpeg.git] / src / bin / jpip / CMakeLists.txt

diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
index f143388787162abce5f558f170cf525780716766..9b24fa4a32b6ff949a52a87c1dae2e8f526408c7 100644 (file)
--- a/src/bin/jpip/CMakeLists.txt
+++ b/src/bin/jpip/CMakeLists.txt
@@ -2,6 +2,8 @@
 include_directories(
   ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common # opj_getopt.h
+  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2 # convert.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip
   ${FCGI_INCLUDE_DIRS}
 )
@@ -15,14 +17,13 @@ install(TARGETS opj_jpip_addxml
   )
 
 if(BUILD_JPIP_SERVER)
-
   set(OPJ_SERVER_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c
   )
 
   # Build executable
   add_executable(opj_server ${OPJ_SERVER_SRCS})
-  target_link_libraries(opj_server openjpip_server)
+  target_link_libraries(opj_server ${FCGI_LIBRARIES} openjpip_server)
   set_property(
     TARGET opj_server
     APPEND PROPERTY
@@ -47,7 +48,7 @@ set(EXES
   opj_jpip_test
   )
 foreach(exe ${EXES})
-  add_executable(${exe} ${exe}.c)
+add_executable(${exe} ${exe}.c)
   target_link_libraries(${exe} openjpip)
   install(TARGETS ${exe}
     EXPORT OpenJPEGTargets
@@ -56,7 +57,15 @@ foreach(exe ${EXES})
 endforeach()
 
 # Build the two java clients:
-find_package(Java 1.5 COMPONENTS Development) # javac, jar
+find_package(Java 1.6 COMPONENTS Development) # javac, jar
+
+# User can override this:
+if(NOT DEFINED JAVA_SOURCE_VERSION)
+  set(JAVA_SOURCE_VERSION 1.6)
+endif()
+if(NOT DEFINED JAVA_TARGET_VERSION)
+  set(JAVA_TARGET_VERSION 1.6)
+endif()
 
 # Only build the java viewer if dev is found:
 if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
@@ -96,6 +105,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
     add_custom_command(
       OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
       COMMAND ${Java_JAVAC_EXECUTABLE} ${jflags}
+      -source ${JAVA_SOURCE_VERSION} -target ${JAVA_TARGET_VERSION}
       -classpath ${APACHE_XERCES_JAR}
       ${java2_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes2
       COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
@@ -126,6 +136,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
     add_custom_command(
       OUTPUT ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
       COMMAND ${Java_JAVAC_EXECUTABLE} ${jflags}
+      -source ${JAVA_SOURCE_VERSION} -target ${JAVA_TARGET_VERSION}
       ${java1_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes1
       COMMAND ${Java_JAR_EXECUTABLE} cfm ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
       ${CMAKE_CURRENT_SOURCE_DIR}/opj_viewer/dist/manifest.txt -C
@@ -146,5 +157,5 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
       )
   endif()
 else()
-  message(WARNING "No java compiler found. Wont be able to build java viewer")
+  message(WARNING "No java compiler found. Won't be able to build java viewer")
 endif()