File tree Expand file tree Collapse file tree 2 files changed +11
-11
lines changed
Expand file tree Collapse file tree 2 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 11cmake_minimum_required (VERSION 3.0)
22cmake_policy (VERSION 3.0)
33
4- set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR } /cmake" )
4+ set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR } /cmake" )
55include (VersioningUtils)
66
7- READ_VERSION_HEADER("" "WPE_[A-Z]+_VERSION" "${CMAKE_SOURCE_DIR } /include/wpe/libwpe-version.h" )
7+ READ_VERSION_HEADER("" "WPE_[A-Z]+_VERSION" "${CMAKE_CURRENT_SOURCE_DIR } /include/wpe/libwpe-version.h" )
88SET_PROJECT_VERSION(${WPE_MAJOR_VERSION} ${WPE_MINOR_VERSION} ${WPE_MICRO_VERSION} )
99set (WPE_API_VERSION "1.0" )
1010
@@ -138,12 +138,12 @@ IF(BUILD_DOCS)
138138 ${HOTDOC} run
139139 --project-name =libwpe
140140 --project-version =1.0
141- --include -paths ="${CMAKE_SOURCE_DIR } /docs"
142- --sitemap=${CMAKE_SOURCE_DIR } /docs/sitemap.txt
141+ --include -paths ="${CMAKE_CURRENT_SOURCE_DIR } /docs"
142+ --sitemap=${CMAKE_CURRENT_SOURCE_DIR } /docs/sitemap.txt
143143 --output =${CMAKE_CURRENT_BINARY_DIR} /Documentation/
144- --c-sources "${CMAKE_SOURCE_DIR } /include/wpe/*.h"
144+ --c-sources "${CMAKE_CURRENT_SOURCE_DIR } /include/wpe/*.h"
145145 --extra-c-flags =-DWPE_COMPILATION=1
146- --c-include -directories ${CMAKE_SOURCE_DIR } /include
146+ --c-include -directories ${CMAKE_CURRENT_SOURCE_DIR } /include
147147 --c-smart-index
148148 )
149149 ELSE ()
Original file line number Diff line number Diff line change @@ -18,12 +18,12 @@ set(ARCHIVE_FULL_NAME ${ARCHIVE_BASE_NAME}.tar.xz)
1818
1919add_custom_target (dist
2020 COMMAND ${CMAKE_COMMAND} -E echo "Creating '${ARCHIVE_FULL_NAME} '..."
21- COMMAND git archive --prefix =${ARCHIVE_BASE_NAME} / HEAD | xz -z > ${CMAKE_BINARY_DIR } /${ARCHIVE_FULL_NAME}
22- COMMAND ${CMAKE_COMMAND} -E echo "Distribution tarball '${ARCHIVE_FULL_NAME} ' created at ${CMAKE_BINARY_DIR } "
23- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR }
21+ COMMAND git archive --prefix =${ARCHIVE_BASE_NAME} / HEAD | xz -z > ${CMAKE_CURRENT_BINARY_DIR } /${ARCHIVE_FULL_NAME}
22+ COMMAND ${CMAKE_COMMAND} -E echo "Distribution tarball '${ARCHIVE_FULL_NAME} ' created at ${CMAKE_CURRENT_BINARY_DIR } "
23+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR }
2424)
2525
26- set (disttest_extract_dir "${CMAKE_BINARY_DIR } /${ARCHIVE_BASE_NAME} " )
26+ set (disttest_extract_dir "${CMAKE_CURRENT_BINARY_DIR } /${ARCHIVE_BASE_NAME} " )
2727set (disttest_build_dir "${disttest_extract_dir} /_build" )
2828set (disttest_install_dir "${disttest_extract_dir} /_install" )
2929
@@ -32,7 +32,7 @@ add_custom_command(OUTPUT ${disttest_build_dir}/Makefile
3232 COMMAND ${CMAKE_COMMAND} -E remove_directory ${disttest_extract_dir}
3333
3434 # extract the tarball
35- COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR } tar -xf ${ARCHIVE_FULL_NAME}
35+ COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR } tar -xf ${ARCHIVE_FULL_NAME}
3636
3737 # create a _build sub-directory
3838 COMMAND ${CMAKE_COMMAND} -E make_directory "${disttest_build_dir} "
You can’t perform that action at this time.
0 commit comments