Skip to content

Commit 3ce22ef

Browse files
committed
Updated CI
1 parent 4ca56b7 commit 3ce22ef

File tree

6 files changed

+14
-21
lines changed

6 files changed

+14
-21
lines changed

.github/workflows/Integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
mkdir _build
2828
cd _build
29-
cmake -D GIT_BRANCH=${{ steps.branch-names.outputs.current_branch || 'master' }} ..
29+
cmake ..
3030
shell: cmd
3131

3232
- name: Build

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
_build
1+
_build
2+
build
3+
cmake-build-*
4+
.idea

images/modified-penguin.bmp

254 KB
Binary file not shown.
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
cmake_minimum_required(VERSION 3.10)
2-
3-
include(CPM.cmake)
4-
5-
6-
# either define GIT_BRANCH at configure time by "cmake -D GIT_BRANCH=master .."
7-
# or it is set automatically in CI
8-
CPMAddPackage("gh:baderouaich/BitmapPlusPlus#${GIT_BRANCH}")
9-
102
project(demo)
11-
123
set(CMAKE_CXX_STANDARD 17) # C++17 or newer is required
134

14-
add_executable(${PROJECT_NAME}
15-
"${CMAKE_CURRENT_SOURCE_DIR}/Main.cpp"
16-
)
5+
include(CPM.cmake)
6+
CPMAddPackage("gh:baderouaich/BitmapPlusPlus#master")
7+
8+
add_executable(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/Main.cpp")
179

1810
target_link_libraries(${PROJECT_NAME} LINK_PRIVATE bmp::BitmapPlusPlus)

integration_tests/fetchcontent/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ FetchContent_Declare(BitmapPlusPlus
1010
)
1111
FetchContent_MakeAvailable(BitmapPlusPlus)
1212

13-
add_executable(${PROJECT_NAME}
14-
"${CMAKE_CURRENT_SOURCE_DIR}/Main.cpp"
15-
)
13+
add_executable(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/Main.cpp")
1614

1715
target_link_libraries(${PROJECT_NAME} LINK_PRIVATE bmp::BitmapPlusPlus)

lib/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
cmake_minimum_required ( VERSION 3.10 )
1+
cmake_minimum_required(VERSION 3.10)
22

3-
add_library ( BitmapPlusPlus INTERFACE )
4-
target_include_directories( BitmapPlusPlus INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include" )
3+
add_library(BitmapPlusPlus INTERFACE)
4+
target_include_directories(BitmapPlusPlus INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
55

6-
add_library ( bmp::BitmapPlusPlus ALIAS BitmapPlusPlus )
6+
add_library(bmp::BitmapPlusPlus ALIAS BitmapPlusPlus)

0 commit comments

Comments
 (0)