From 5ad6b4f099f2e65b83bdd9f788ee6f7f45302e1f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 15 Sep 2011 14:55:00 -0400 Subject: add configuration for constructing doxygen documentation --- indra/CMakeLists.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 4b1bf49d07..ad3b9b72fa 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -107,10 +107,10 @@ if (VIEWER) endif (VIEWER) # Linux builds the viewer and server in 2 separate projects -# In order for build server to work on linux, +# In order for build server to work on linux, # the viewer project needs a server target. # This is not true for mac and windows. -if (LINUX) +if (LINUX) add_custom_target(server) endif (LINUX) if (SERVER) @@ -132,3 +132,16 @@ if (LL_TESTS) # individual apps can add themselves as dependencies add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests) endif (LL_TESTS) + +# add a target to generate API documentation with Doxygen +find_package(Doxygen) +if(DOXYGEN_FOUND) + find_program(PERL perl) # I am not sure if this is really needed or not + GET_FILENAME_COMPONENT(DOXYGEN_TOP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} PATH) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) + add_custom_target(doc + ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating API documentation with Doxygen" VERBATIM + ) +endif(DOXYGEN_FOUND) -- cgit v1.2.3 From ca08bd5aba5e69fce3b0f5b4f861ffec9fe4d2e5 Mon Sep 17 00:00:00 2001 From: Cinder Date: Sun, 8 Feb 2015 12:53:39 -0700 Subject: OPEN-292 - Remove lscript from project, Remove legacy udp script upload methods, Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore. --- indra/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 10692402a5..b0dbe62a0c 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -39,8 +39,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs) add_subdirectory(${LIBS_OPEN_PREFIX}llwindow) add_subdirectory(${LIBS_OPEN_PREFIX}llxml) -add_subdirectory(${LIBS_OPEN_PREFIX}lscript) - if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts) endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) -- cgit v1.2.3 From 79ae34c1312a80fd9fab1c487a4556ba7254019c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 10 Jul 2015 12:24:21 -0400 Subject: move doxygen generation to a subdirectory --- indra/CMakeLists.txt | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 15b2329fc9..1e1d6dc585 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -91,21 +91,11 @@ endif (LINUX) add_subdirectory(${VIEWER_PREFIX}newview) add_dependencies(viewer secondlife-bin) +add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL) + if (LL_TESTS) # Define after the custom targets are created so # individual apps can add themselves as dependencies add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests) endif (LL_TESTS) -# add a target to generate API documentation with Doxygen -find_package(Doxygen) -if(DOXYGEN_FOUND) - find_program(PERL perl) # I am not sure if this is really needed or not - GET_FILENAME_COMPONENT(DOXYGEN_TOP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} PATH) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) - add_custom_target(doc - ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating API documentation with Doxygen" VERBATIM - ) -endif(DOXYGEN_FOUND) -- cgit v1.2.3 From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/CMakeLists.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/CMakeLists.txt (limited to 'indra/CMakeLists.txt') diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt old mode 100755 new mode 100644 -- cgit v1.2.3