trunk: fixed cmake config so as to be able to link opj_jpip_server with FCGI.

CMakeLists.txt

@@ -213,7 +213,15 @@ OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
 
 #-----------------------------------------------------------------------------
 # Build Library
-add_subdirectory(src)
+if(BUILD_JPIP_SERVER)
+  find_package(CURL REQUIRED)
+  find_package(FCGI REQUIRED)
+  find_package(Threads REQUIRED)
+  if(NOT CMAKE_USE_PTHREADS_INIT)
+    message(FATAL_ERROR "Only pthread are supported")
+  endif()
+endif()
+add_subdirectory(src/lib)
 
 #-----------------------------------------------------------------------------
 # Build Applications

src/CMakeLists.txt

@@ -1,12 +1,12 @@
 # required dep for server:
-if(BUILD_JPIP_SERVER)
-  find_package(CURL REQUIRED)
-  find_package(FCGI REQUIRED)
-  find_package(Threads REQUIRED)
-  if(NOT CMAKE_USE_PTHREADS_INIT)
-    message(FATAL_ERROR "Only pthread are supported")
-  endif()
-endif()
+#if(BUILD_JPIP_SERVER)
+#  find_package(CURL REQUIRED)
+#  find_package(FCGI REQUIRED)
+#  find_package(Threads REQUIRED)
+#  if(NOT CMAKE_USE_PTHREADS_INIT)
+#    message(FATAL_ERROR "Only pthread are supported")
+#  endif()
+#endif()
 
-add_subdirectory(lib)
+#add_subdirectory(lib)
 #add_subdirectory(bin)

src/bin/jpip/CMakeLists.txt

@@ -23,7 +23,7 @@ if(BUILD_JPIP_SERVER)
 
   # 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