Skip to content

Commit 0058a19

Browse files
donny-dontaperezdc
authored andcommitted
CMake: Use current source and binary directory
If libpwe is built within a larger CMake project, using the FetchContent module, its use of `CMAKE_SOURCE_DIR` instead of `CMAKE_CURRENT_SOURCE_DIR` makes it so things like modules aren't loaded properly. Move all uses of `CMAKE_SOURCE_DIR` and `CMAKE_BINARY_DIR` to their `CURRENT` variant.
1 parent afbc04d commit 0058a19

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cmake_minimum_required(VERSION 3.0)
22
cmake_policy(VERSION 3.0)
33

4-
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
4+
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
55
include(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")
88
SET_PROJECT_VERSION(${WPE_MAJOR_VERSION} ${WPE_MINOR_VERSION} ${WPE_MICRO_VERSION})
99
set(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()

cmake/DistTargets.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ set(ARCHIVE_FULL_NAME ${ARCHIVE_BASE_NAME}.tar.xz)
1818

1919
add_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}")
2727
set(disttest_build_dir "${disttest_extract_dir}/_build")
2828
set(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}"

0 commit comments

Comments
 (0)