fixed: set a default docdir

also set the common executable directory in AppCommon
This commit is contained in:
Arne Morten Kvarving
2017-05-22 10:47:38 +02:00
parent 79fa468077
commit 62714fa166
4 changed files with 5 additions and 5 deletions

View File

@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 2.6)
include_directories(${PROJECT_SOURCE_DIR})
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
if(IFEM_AS_SUBMODULE)
set(IFEM_LIBRARIES IFEM ${IFEM_DEPLIBS})

View File

@@ -69,10 +69,6 @@ include_directories(${IFEM_INCLUDES})
set(EXECUTABLE_OUTPUT_PATH bin)
set(LIBRARY_OUTPUT_PATH lib)
if(NOT CMAKE_INSTALL_DOCDIR)
set(CMAKE_INSTALL_DOCDIR share/doc/libifem1)
endif()
# Generate build flags in build tree
configure_file(${PROJECT_SOURCE_DIR}/cmake/Modules/IFEMFlags.cmake.in
IFEMFlags.cmake @ONLY)

View File

@@ -250,7 +250,7 @@ include_directories(${IFEM_INCLUDE_DIRS})
add_definitions(${IFEM_DEFINITIONS})
set(IFEM_CHECKCOMMITS_SCRIPT ${IFEM_PATH}/cmake/Scripts/CheckCommits.cmake)
if(NOT CMAKE_INSTALL_DOCDIR)
set(CMAKE_INSTALL_DOCDIR libifem1)
set(CMAKE_INSTALL_DOCDIR share/doc/libifem1)
endif()
include(CheckCXXCompilerFlag)

View File

@@ -8,6 +8,9 @@ macro(add_doc_target appname dox)
configure_file(doc/${dox}.dox.in ${dox}.dox)
if(IFEM_INSTALL_DOXY)
if(NOT CMAKE_INSTALL_DOCDIR)
set(CMAKE_INSTALL_DOCDIR share/doc/libifem1)
endif()
install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_BUILD_TOOL} doc WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\")" COMPONENT doc)
install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/Apps/${appname}
COMPONENT doc