Skip to content

Commit a316418

Browse files
committed
Debug windows GA CI
1 parent b8140ce commit a316418

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

.github/workflows/windows-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
build-config: [Release, Debug]
2525
build-platform: [x86, x64]
2626
build-runtime: [/MT]
27-
build-shared: [TRUE, FALSE]
27+
build-shared: [FALSE]
2828

2929
include:
3030
- compiler: msvc-2017
@@ -72,7 +72,7 @@ jobs:
7272
echo "###########2 " %PATH%
7373
mkdir -p .build
7474
cd .build
75-
cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
75+
cmake .. -G "%INPUT_GENERATOR%" -DCMAKE_BUILD_TYPE=%INPUT_BUILD_CONFIG% -DJINJA2CPP_MSVC_RUNTIME_TYPE="%INPUT_BUILD_RUNTIME%" -DJINJA2CPP_DEPS_MODE=external-boost -DJINJA2CPP_BUILD_SHARED=%INPUT_BUILD_SHARED% -DJINJA2CPP_VERBOSE=ON -DBoost_DEBUG=ON %INPUT_BASE_FLAGS% %INPUT_EXTRA_FLAGS%
7676
cmake --build . --config %INPUT_BUILD_CONFIG%
7777
7878
- name: Test

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ option(JINJA2CPP_BUILD_TESTS "Build Jinja2Cpp unit tests" ${JINJA2CPP_IS_MAIN_PR
2020
option(JINJA2CPP_STRICT_WARNINGS "Enable additional warnings and treat them as errors" ON)
2121
option(JINJA2CPP_BUILD_SHARED "Build shared linkage version of Jinja2Cpp" OFF)
2222
option(JINJA2CPP_PIC "Control -fPIC option for library build" OFF)
23+
option(JINJA2CPP_VERBOSE "Add extra debug output to the build scripts" OFF)
2324

2425
if (DEFINED BUILD_SHARED_LIBS)
2526
set(JINJA2CPP_BUILD_SHARED BUILD_SHARED_LIBS)
@@ -94,7 +95,6 @@ else ()
9495
endif ()
9596
add_definitions(-DBOOST_ALL_NO_LIB)
9697
set(MSVC_CXX_FLAGS ${MSVC_CXX_FLAGS} /wd4503 /bigobj)
97-
# MSVC
9898

9999
if (CMAKE_BUILD_TYPE MATCHES "Debug" AND JINJA2CPP_MSVC_RUNTIME_TYPE)
100100
set(JINJA2CPP_MSVC_RUNTIME_TYPE "${JINJA2CPP_MSVC_RUNTIME_TYPE}d")

thirdparty/external_boost_deps.cmake

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
find_package(boost_filesystem QUIET)
2-
find_package(boost_algorithm QUIET)
3-
find_package(boost_variant QUIET)
4-
find_package(boost_optional QUIET)
1+
if (JINJA2CPP_VERBOSE)
2+
set (FIND_BOOST_PACKAGE_QUIET)
3+
else ()
4+
set (FIND_BOOST_PACKAGE_QUIET)
5+
endif ()
6+
7+
find_package(boost_filesystem ${FIND_BOOST_PACKAGE_QUIET})
8+
find_package(boost_algorithm ${FIND_BOOST_PACKAGE_QUIET})
9+
find_package(boost_variant ${FIND_BOOST_PACKAGE_QUIET})
10+
find_package(boost_optional ${FIND_BOOST_PACKAGE_QUIET})
511

612
if(boost_filesystem_FOUND AND
713
boost_algorithm_FOUND AND
@@ -23,10 +29,13 @@ else()
2329
set (Boost_USE_STATIC_LIBS ON)
2430
set (Boost_USE_STATIC_RUNTIME ON)
2531
endif ()
32+
if (JINJA2CPP_VERBOSE)
33+
message (STATUS ">>>DEBUG<<< Boost_USE_STATIC_RUNTIME = ${Boost_USE_STATIC_RUNTIME}")
34+
endif ()
2635
endif ()
2736
endif ()
2837

29-
find_package(Boost COMPONENTS system filesystem QUIET REQUIRED)
38+
find_package(Boost COMPONENTS system filesystem ${FIND_BOOST_PACKAGE_QUIET} REQUIRED)
3039

3140
if (Boost_FOUND)
3241
imported_target_alias(boost_filesystem ALIAS Boost::filesystem)

0 commit comments

Comments
 (0)