Skip to content

Commit

Permalink
Removed old build files, added install targets and other options
Browse files Browse the repository at this point in the history
  • Loading branch information
Dimitri van Heesch committed May 17, 2015
1 parent 2e39e5c commit 7bcf8e9
Show file tree
Hide file tree
Showing 226 changed files with 200 additions and 10,381 deletions.
20 changes: 18 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ option(build_wizard "Build the GUI frontend for doxygen." OFF)
option(build_app "Example showing how to embed doxygen in an application." OFF)
option(build_xmlparser "Example showing how to parse doxygen's XML output." OFF)
option(build_search "Build external search tools (doxysearch and doxyindexer)" OFF)
option(build_doc "Build user manual" OFF)
option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF)
option(use_libclang "Add support for libclang parsing." OFF)
option(qt_static "Link doxywizard with /MT in stead of /MD on windows" OFF)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(version)
Expand All @@ -31,11 +33,12 @@ if (use_sqlite3)
endif()
if (use_libclang)
set(clang "1" CACHE INTERNAL "used in settings.h")
find_package(LibClang REQUIRED)
endif()


if (${CMAKE_SYSTEM} MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "-Wno-deprecated-register ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=10.5 ${CMAKE_CXX_FLAGS}")
find_library(CORESERVICES_LIB CoreServices)
set(EXTRA_LIBS ${CORESERVICES_LIB})
endif()
Expand All @@ -59,11 +62,24 @@ endif()
find_package(Iconv REQUIRED)
include_directories(${ICONV_INCLUDE_DIR})

set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")
#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)
set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc)
set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
set(GENERATED_SRC "${CMAKE_BINARY_DIR}/generated_src" CACHE INTERNAL "Stores generated files")
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
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")

if (${CUSTOM_INCLUDE_DIR})
include_directories(${CUSTOM_INCLUDE_DIR})
endif()

if (${CUSTOM_LINK_DIR})
link_directories(${CUSTOM_LINK_DIR})
endif()

add_subdirectory(libmd5)
add_subdirectory(qtools)
Expand Down
161 changes: 0 additions & 161 deletions Makefile.in

This file was deleted.

34 changes: 0 additions & 34 deletions Makefile.win_make.in

This file was deleted.

51 changes: 0 additions & 51 deletions Makefile.win_nmake.in

This file was deleted.

15 changes: 0 additions & 15 deletions addon/doxmlparser/src/Makefile.in

This file was deleted.

27 changes: 0 additions & 27 deletions addon/doxmlparser/src/doxmlparser.pro.in

This file was deleted.

3 changes: 3 additions & 0 deletions addon/doxyapp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ vhdlparser
${ICONV_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${SQLITE3_LIBRARIES}
${EXTRA_LIBS}
)

install(TARGETS doxyapp DESTINATION bin)

endif()
19 changes: 0 additions & 19 deletions addon/doxyapp/Makefile.in

This file was deleted.

12 changes: 0 additions & 12 deletions addon/doxyapp/doxyapp.pro.in

This file was deleted.

Loading

0 comments on commit 7bcf8e9

Please sign in to comment.