diff options
| author | Antonin Descampe <antonin@gmail.com> | 2013-10-30 08:59:23 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2013-10-30 08:59:23 +0000 |
| commit | 05f796d2fabd08dd1ab575dca6f59ca6bf18b70c (patch) | |
| tree | f63981c05e2e45afef8946f4ac0cf8fae5e5c7ea /src | |
| parent | bd8c91b37dc1b9345130d63582a063b59628b227 (diff) | |
trunk: fixed cmake config so as to be able to link opj_jpip_server with FCGI.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/bin/jpip/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 673843ec..87526cfc 100644 --- a/src/CMakeLists.txt +++ b/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) diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt index 45f0007b..9404c111 100644 --- a/src/bin/jpip/CMakeLists.txt +++ b/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 |