diff options
| author | Jordan Williams <jordan@jwillikers.com> | 2022-07-23 06:21:44 -0500 |
|---|---|---|
| committer | Jordan Williams <jordan@jwillikers.com> | 2022-07-25 14:14:57 -0500 |
| commit | fac146f44d235a1c8c810de09c9582a0dd28b406 (patch) | |
| tree | d3cf0a07fc883e29bfacd3cdc68d33647126d295 /doc | |
| parent | ad5836cb0d24b0f4f35ee6d57392e21570f56689 (diff) | |
| download | dbus-fac146f44d235a1c8c810de09c9582a0dd28b406.tar.gz | |
Use project relative paths in CMake files
This makes it possible for projects to incorporate D-Bus as a CMake sub-project in a larger CMake project.
Before this PR, doing so would result in many errors.
This is because CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR would point to directories above the D-Bus project.
Using paths relative to the project directory, PROJECT_SOURCE_DIR and PROJECT_BINARY_DIR, corrects for this.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index cdc58a07..db93daec 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -12,8 +12,8 @@ if(DOXYGEN_EXECUTABLE) endif() if(DBUS_ENABLE_DOXYGEN_DOCS) - set(top_srcdir ${CMAKE_SOURCE_DIR}) - set(top_builddir ${CMAKE_BINARY_DIR}) + set(top_srcdir ${PROJECT_SOURCE_DIR}) + set(top_builddir ${PROJECT_BINARY_DIR}) if(WIN32) set(DBUS_GENERATE_MAN NO) else() @@ -35,15 +35,15 @@ if(DBUS_ENABLE_DOXYGEN_DOCS) set(DOXYGEN_GENERATE_QHP NO) set(DBUS_ENABLE_QTHELP_DOCS OFF PARENT_SCOPE) endif() - configure_file(../Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile ) - file(GLOB dbus_files "${CMAKE_SOURCE_DIR}/dbus/*.[ch]*") + configure_file(../Doxyfile.in ${PROJECT_BINARY_DIR}/Doxyfile ) + file(GLOB dbus_files "${PROJECT_SOURCE_DIR}/dbus/*.[ch]*") add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doxygen.stamp - DEPENDS ${CMAKE_SOURCE_DIR}/Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile ${dbus_files} + DEPENDS ${PROJECT_SOURCE_DIR}/Doxyfile.in ${PROJECT_BINARY_DIR}/Doxyfile ${dbus_files} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/api/html COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/api/man COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/api/xml - COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile + COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/doxygen.stamp WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating API documentation with Doxygen" @@ -149,10 +149,10 @@ macro(COPYDIR _src _type) foreach(FILE_TYPE ${_type}) foreach(DIR ${_src}) file(GLOB FILES "${DIR}/${FILE_TYPE}" ) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR}) + file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${DIR}) foreach(FILE ${FILES}) get_filename_component(FILENAME ${FILE} NAME) - set(TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME}) + set(TARGET ${PROJECT_BINARY_DIR}/${DIR}/${FILENAME}) configure_file(${FILE} ${TARGET} COPYONLY) if(CONFIG_VERBOSE) message("FROM: ${FILE}\nTO: ${TARGET}\n") |