Skip to content

Commit efcdce5

Browse files
committed
- remove libcajun-dev from list of packages needed for linux CI builds, we just use the version we carry in the contrib folder
1 parent 7160616 commit efcdce5

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

.github/workflows/linux-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
libasio-dev \
4747
libboost-all-dev \
4848
libc-ares-dev \
49-
libcajun-dev \
5049
libcppunit-dev \
5150
libdb++-dev \
5251
libfmt-dev \

CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -604,16 +604,8 @@ if(USE_BDB)
604604
endif()
605605

606606
# Cajun
607-
# Debian: libcajun-dev
608607
if(USE_CAJUN)
609-
#if(USE_CONTRIB)
610-
# FIXME: convert Cajun to CMake build system
611-
# FIXME: include Cajun as a Git submodule or NuGet
612-
#add_subdirectory(contrib/cajun)
613-
set(CAJUN_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/cajun/include")
614-
#else()
615-
# find_package(cajun REQUIRED)
616-
#endif()
608+
set(CAJUN_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/cajun/include")
617609
endif()
618610

619611
# ASIO

0 commit comments

Comments
 (0)