Skip to content

Commit b69aeb1

Browse files
authored
Merge pull request #5 from bw-hro/improve-build-system
Use CMAKE_CURRENT_SOURCE_DIR as root dir…
2 parents 39714d0 + fa7b0db commit b69aeb1

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
cmake_minimum_required(VERSION 3.15)
22
cmake_policy(SET CMP0091 NEW)
33

4-
message(STATUS "Read contents from vcpkg.json")
5-
file(READ "${CMAKE_SOURCE_DIR}/vcpkg.json" VCPKG_JSON_CONTENT)
4+
set(SQLITEMAP_VCPKG_JSON "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg.json")
5+
message(STATUS "Read contents from ${SQLITEMAP_VCPKG_JSON}")
6+
file(READ ${SQLITEMAP_VCPKG_JSON} VCPKG_JSON_CONTENT)
67

7-
message(STATUS "Extract version from vcpkg.json")
8+
message(STATUS "Extract version from ${SQLITEMAP_VCPKG_JSON}")
89
string(REGEX MATCH "\"version-string\"[ \t]*:[ \t]*\"([^\"]+)\"" VERSION_MATCH "${VCPKG_JSON_CONTENT}")
910
if (VERSION_MATCH)
1011
string(REGEX REPLACE "\"version-string\"[ \t]*:[ \t]*\"([^\"]+)\"" "\\1" SQLITEMAP_VERSION "${VERSION_MATCH}")
11-
message(STATUS "Extracted version from vcpkg.json: ${SQLITEMAP_VERSION}")
12+
message(STATUS "Extracted version from ${SQLITEMAP_VCPKG_JSON}: ${SQLITEMAP_VERSION}")
1213
else()
13-
message(FATAL_ERROR "Could not extract version from vcpkg.json")
14+
message(FATAL_ERROR "Could not extract version from ${SQLITEMAP_VCPKG_JSON}")
1415
endif()
1516

1617
project(sqlitemap VERSION ${SQLITEMAP_VERSION} DESCRIPTION "sqlitemap is a lightweight wrapper around SQLite providing a map like interface" LANGUAGES CXX)

0 commit comments

Comments
 (0)