Commit 366ae28c authored by RIOU Cedric's avatar RIOU Cedric

[Doc] Fix documentation generation under linux OS

parent 82f01112
......@@ -159,7 +159,7 @@ ELSEIF(UNIX)
SET(OV_EIGEN_FLAGS "-msse2")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ${OV_EIGEN_FLAGS}")
# This ENV var is needed to locate our custom IT++ on Linux
SET(ENV{PKG_CONFIG_PATH} "${OV_CUSTOM_DEPENDENCIES_PATH}/lib/pkgconfig")
SET(ENV{PKG_CONFIG_PATH} "${LIST_DEPENDENCIES_PATH}/lib/pkgconfig")
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES i386|i586|i686)
set ( BIT_MODE "32")
......
......@@ -14,11 +14,11 @@ SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_
# ---------------------------------
SET_BUILD_PLATFORM()
if(NOT CMAKE_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio*")
if(NOT(CMAKE_BUILD_TYPE) AND CMAKE_GENERATOR MATCHES "Visual Studio*")
set(MULTI_BUILD TRUE)
endif()
IF(NOT ${SKIP_DOCUMENTATION})
IF(NOT(${SKIP_DOCUMENTATION}))
if(MULTI_BUILD) # Replace with generator expression in CMake 3.5+
foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIGU)
......@@ -53,9 +53,7 @@ IF(NOT ${SKIP_DOCUMENTATION})
ENDIF()
add_subdirectory(src)
# Install scenarios files related to documentation
INSTALL(DIRECTORY ${DOCUMENTATION_TEMP_DIRECTORY}/openvibe/scenarios DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/openvibe)
ENDIF()
......
......@@ -10,8 +10,8 @@
ADD_CUSTOM_TARGET(${PROJECT_NAME} ALL)
# look for doxygen, if not present, no need to generate documentation
FIND_PROGRAM(doxygen_bin "doxygen" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/bin NO_DEFAULT_PATH)
FIND_PROGRAM(doxygen_bin "doxygen" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/bin "C:/Program Files/doxygen/bin")
FIND_PROGRAM(doxygen_bin "doxygen" PATHS ${LIST_DEPENDENCIES_PATH}/bin NO_DEFAULT_PATH)
FIND_PROGRAM(doxygen_bin "doxygen" PATHS ${LIST_DEPENDENCIES_PATH}/bin "C:/Program Files/doxygen/bin")
IF(doxygen_bin)
......@@ -89,14 +89,6 @@ IF(doxygen_bin)
ENDFOREACH(current_project)
# look for box snapshots generated by the plugin inspector
FILE(GLOB_RECURSE resource_files_tmp "${CMAKE_CURRENT_BINARY_DIR}/*.png")
SET(resource_files ${resource_files} ${resource_files_tmp})
IF(resource_files)
INSTALL(FILES ${resource_files} DESTINATION "${DIST_DOCDIR}")
ENDIF(resource_files)
# the final doxyfile filename is generated, platform compliantly
SET(ov_doxy_final "${CMAKE_CURRENT_BINARY_DIR}/doxyfile")
......@@ -144,7 +136,7 @@ IF(WIN32)
ADD_CUSTOM_COMMAND(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${OV_CUSTOM_DEPENDENCIES_PATH}/cmake/bin/cmake.exe -P CreateDoxygen.cmake
COMMAND ${LIST_DEPENDENCIES_PATH}/cmake/bin/cmake.exe -P CreateDoxygen.cmake
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
ELSEIF(UNIX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment