Skip to content

Commit 8f56e7a

Browse files
committed
Move CMAKE_MODULE_PATH into CMakeLists.txt
1 parent 299e3b4 commit 8f56e7a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ cmake_policy(VERSION 3.5)
1010

1111
project(cmake-sbom)
1212

13+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
14+
1315
include(sbom)
1416

1517
reuse_lint()

dist/ubuntu/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ fi
1616
mkdir -p build
1717
cd build
1818

19-
cmake ../../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="`pwd`/deploy" \
20-
-DCMAKE_MODULE_PATH="`pwd`/../../../cmake" -DPython3_ROOT_DIR="`pwd`/../../venv" "$@"
19+
cmake ../../.. --no-warn-unused-cli -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="`pwd`/deploy" \
20+
-DPython3_ROOT_DIR="`pwd`/../../venv" -DPython3_EXECUTABLE="`pwd`/../../venv/bin/python3" "$@"
2121

2222
cmake --build . --target install
2323

dist/win32/build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if not exist build mkdir build
3232
if errorlevel 1 goto error
3333
cd build
3434
if errorlevel 1 goto error
35-
cmake ..\..\.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="%cmake_here%/build/deploy" -DCMAKE_MODULE_PATH="%cmake_here%/../../cmake" -DPython3_EXECUTABLE="%cmake_here%/../venv/Scripts/python.exe" %*
35+
cmake ..\..\.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="%cmake_here%/build/deploy" -DPython3_EXECUTABLE="%cmake_here%/../venv/Scripts/python.exe" %*
3636
if errorlevel 1 goto error
3737
cmake --build . --target install
3838
if errorlevel 1 goto error

0 commit comments

Comments
 (0)