diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-06-06 09:48:44 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-06-06 09:48:44 (GMT) |
| commit | 84d94779e76681b63cdcbc362bbe0341cd39064d (patch) | |
| tree | ea960c938df1abfecca2f6883dd1b805fbe5b59d | |
| parent | faef77a87cecd703e3629a35d2e22efb07e682a0 (diff) | |
| download | Doxygen-84d94779e76681b63cdcbc362bbe0341cd39064d.zip Doxygen-84d94779e76681b63cdcbc362bbe0341cd39064d.tar.gz Doxygen-84d94779e76681b63cdcbc362bbe0341cd39064d.tar.bz2 | |
Added missing libraries for building doxysearch on Windows
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | addon/doxysearch/CMakeLists.txt | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5298ce3..eba0fd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ endif() find_package(Iconv REQUIRED) include_directories(${ICONV_INCLUDE_DIR}) + #set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") set(DOC_INSTALL_DIR "share/doc/packages/doxygen" CACHE STRING "Relative path where to install the documentation") set(EXAMPLE_DIR ${CMAKE_SOURCE_DIR}/examples) @@ -74,6 +75,13 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(CUSTOM_INCLUDE_DIR "" CACHE FILEPATH "Extra include path") set(CUSTOM_LINK_DIR "" CACHE FILEPATH "Extra library path") +# place binaries for all build types in the same directory, so we know where to find it +# when running tests or generating docs +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXECUTABLE_OUTPUT_PATH}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXECUTABLE_OUTPUT_PATH}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${EXECUTABLE_OUTPUT_PATH}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${EXECUTABLE_OUTPUT_PATH}) + # gather lang codes for translation file(GLOB lang_files RELATIVE "${CMAKE_SOURCE_DIR}/src" "${CMAKE_SOURCE_DIR}/src/translator_??.h") set(lcodes "") diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt index e3511aa..33e01c1 100644 --- a/addon/doxysearch/CMakeLists.txt +++ b/addon/doxysearch/CMakeLists.txt @@ -3,6 +3,10 @@ if (build_search) find_package(Xapian REQUIRED) find_package(ZLIB REQUIRED) +if (WIN32) + set(WIN_EXTRA_LIBS "uuid.lib rpcrt4.lib ws2_32.lib") +endif() + include_directories( ${CMAKE_SOURCE_DIR}/qtools ${XAPIAN_INCLUDE_DIR} @@ -14,6 +18,7 @@ add_executable(doxyindexer target_link_libraries(doxyindexer ${XAPIAN_LIBRARIES} ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} qtools ) @@ -23,6 +28,7 @@ add_executable(doxysearch.cgi target_link_libraries(doxysearch.cgi ${XAPIAN_LIBRARIES} ${ZLIB_LIBRARIES} + ${WIN_EXTRA_LIBS} ) install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) |