Skip to content

Commit 3120bbf

Browse files
committed
Merge pull request #2013 from UV-CDAT/fix_docs_build_errors
Updated cmake to use new location for legal and readme
2 parents 6e74cf5 + fe75ca4 commit 3120bbf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,8 @@ set(CPACK_PACKAGE_VERSION_MAJOR "2")
831831
set(CPACK_PACKAGE_VERSION_MINOR "3")
832832
set(CPACK_PACKAGE_VERSION_PATCH "0")
833833
set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
834-
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/docs/README.txt")
835-
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/docs/Legal.txt")
834+
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
835+
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LEGAL.txt")
836836
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Aashish Chaudhary") #required
837837
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
838838
set(CPACK_RPM_PACKAGE_PROVIDES /usr/local/uvcdat/bin/python /usr/local/uvcdat/bin/python2.7)
@@ -883,7 +883,7 @@ install(CODE "
883883
endif ()
884884
endif ()
885885
endforeach()
886-
886+
887887
888888
file(INSTALL FILES \${resolved_programs} DESTINATION
889889
\"\${CMAKE_INSTALL_PREFIX}/${CPACK_DESTINATION_BIN_PREFIX}\"
@@ -971,7 +971,7 @@ install(CODE "
971971
PERMISSIONS USE_SOURCE_PERMISSIONS
972972
)
973973
endif()
974-
974+
975975
file(INSTALL FILES ${cdat_BINARY_DIR}/build_info.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/info)
976976
977977
# Unset QT_LIB_DIR as we need to use the one in user's environment

0 commit comments

Comments
 (0)