github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2504 from Hallot/fix/cmake-mosquitto-as-submodule

Browse Source 
CMake: Use PROJECT_SOURCE_DIR to improve using mosquitto as subdirectory
pull/2509/head
Roger Light 4 years ago committed by GitHub
parent 74814cc68f 8504f6b70b
commit 3cdeb595ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape Escape View File

@ -10,7 +10,7 @@ cmake_policy(SET CMP0042 NEW)
project(mosquitto) project(mosquitto)
set (VERSION 2.0.14) 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}\") add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")

8
man/CMakeLists.txt
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save