diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 38b0d80c..9ca14d32 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -267,7 +267,7 @@ if (ATCA_JWT_SUPPORT)
     source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${JWT_SRC_GRP})
 endif()
 
-if (ATCA_CA_SUPPORT)
+if (ATCA_CA_SUPPORT OR ATCA_CA2_SUPPORT)
     add_subdirectory(calib)
     file(GLOB CALIB_SRC_GRP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "calib/*.c")
     file(GLOB HOST_SRC_GRP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "host/*.c")
diff --git a/lib/calib/CMakeLists.txt b/lib/calib/CMakeLists.txt
index 0ec29f7c..535421c4 100644
--- a/lib/calib/CMakeLists.txt
+++ b/lib/calib/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.0)
 project(casupport C)
 
-if(ATCA_CA_SUPPORT)
+if(ATCA_CA_SUPPORT OR ATCA_CA2_SUPPORT)
     file(GLOB CALIB_SRC "*.c")
     file(GLOB CALIB_INC "*.h")
     file(GLOB HOST_SRC "../host/*.c")