Skip to content

Commit

Permalink
cmake: use ${CMAKE_CURRENT_SOURCE_DIR} where possible
Browse files Browse the repository at this point in the history
This makes things rely less on their current relative locations in the
sources.
  • Loading branch information
pinotree committed Aug 19, 2023
1 parent 4406b24 commit 930c6dd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

add_custom_target(doxygen
COMMAND doxygen doxygen.config
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/doc")
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")

add_custom_target(docs
COMMAND make html
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/doc")
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_dependencies(docs doxygen)

set(lager_ssh_method
Expand All @@ -18,5 +18,5 @@ set(lager_ssh_method
add_custom_target(upload-docs
COMMAND
rsync -av -e \"${lager_ssh_method}\"
${CMAKE_SOURCE_DIR}/doc/_build/html/*
${CMAKE_CURRENT_SOURCE_DIR}/_build/html/*
[email protected]:public/lager/)
6 changes: 3 additions & 3 deletions example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if (Qt5Core_FOUND AND Qt5Concurrent_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND
set_target_properties(todo-qml PROPERTIES AUTOMOC YES)
target_link_libraries(todo-qml lager-example Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::QuickControls2)
target_compile_definitions(todo-qml PRIVATE
LAGER_TODO_QML_DIR="${CMAKE_SOURCE_DIR}/example/todo/qml")
LAGER_TODO_QML_DIR="${CMAKE_CURRENT_SOURCE_DIR}/todo/qml")
add_dependencies(examples todo-qml)

add_executable(todo-qml-redux EXCLUDE_FROM_ALL
Expand All @@ -131,7 +131,7 @@ if (Qt5Core_FOUND AND Qt5Concurrent_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND
set_target_properties(todo-qml-redux PROPERTIES AUTOMOC YES)
target_link_libraries(todo-qml-redux lager-example Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::QuickControls2)
target_compile_definitions(todo-qml-redux PRIVATE
LAGER_TODO_QML_DIR="${CMAKE_SOURCE_DIR}/example/todo/qml-redux")
LAGER_TODO_QML_DIR="${CMAKE_CURRENT_SOURCE_DIR}/todo/qml-redux")
add_dependencies(examples todo-qml-redux)

add_executable(snake-qml EXCLUDE_FROM_ALL
Expand All @@ -140,7 +140,7 @@ if (Qt5Core_FOUND AND Qt5Concurrent_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND
target_link_libraries(snake-qml lager-example Qt5::Core Qt5::Concurrent Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::QuickControls2)
target_include_directories(snake-qml PRIVATE ${Boost_INCLUDE_DIRS})
target_compile_definitions(snake-qml PRIVATE
LAGER_SNAKE_QML_DIR="${CMAKE_SOURCE_DIR}/example/snake/qml")
LAGER_SNAKE_QML_DIR="${CMAKE_CURRENT_SOURCE_DIR}/snake/qml")
add_dependencies(examples snake-qml)
else()
message(STATUS "Disabling Qt based examples")
Expand Down

0 comments on commit 930c6dd

Please sign in to comment.