CMake: Use PROJECT_SOURCE_DIR to improve using mosquitto as subdirectory

When mosquitto is included as subdirectory, `CMAKE_SOURCE_DIR` does not refer to the mosquitto top level CMake file, but to the whole project top level CMake. Use `PROJECT_SOURCE_DIR` instead to refer to the right CMake in both contextes. Signed-off-by: Pierre Hallot <[email protected]>
eclipse · Apr 5, 2022 · 8504f6b · 8504f6b
1 parent 74814cc
commit 8504f6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ cmake_policy(SET CMP0042 NEW)
 project(mosquitto)
 set (VERSION 2.0.14)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
+list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
 
 add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
 

diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
@@ -8,10 +8,10 @@ if(NOT WIN32)
  find_program(XSLTPROC xsltproc OPTIONAL)
  if(XSLTPROC)
  function(compile_manpage page)
- add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/man/${page}
- COMMAND xsltproc ${CMAKE_SOURCE_DIR}/man/${page}.xml -o ${CMAKE_SOURCE_DIR}/man/
- MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/man/${page}.xml)
- add_custom_target(${page} ALL DEPENDS ${CMAKE_SOURCE_DIR}/man/${page})
+ add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/man/${page}
+ COMMAND xsltproc ${PROJECT_SOURCE_DIR}/man/${page}.xml -o ${PROJECT_SOURCE_DIR}/man/
+ MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/man/${page}.xml)
+ add_custom_target(${page} ALL DEPENDS ${PROJECT_SOURCE_DIR}/man/${page})
  endfunction()
 
  compile_manpage("mosquitto_ctrl.1")