diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4764bcc8f407e759a6b1759155e22da956b1f3d4..35a9b11fa2fe528cab3c046247b65cb937d0e1a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,16 +159,16 @@ if(DD4HEP_USE_HEPMC3)
   find_package(HepMC3 REQUIRED)
 
   # Optional dependencies for compressed input support
-  if(${HEPMC3_VERSION} VERSION_GREATER_EQUAL "3.02.05")
+  if(HEPMC3_VERSION VERSION_GREATER_EQUAL "3.02.05")
     option(DD4HEP_HEPMC3_COMPRESSION_SUPPORT "Enable reading of compressed HepMC files" ON)
-    if(${DD4HEP_HEPMC3_COMPRESSION_SUPPORT})
+    if(DD4HEP_HEPMC3_COMPRESSION_SUPPORT)
       find_package(ZLIB REQUIRED)
       find_package(LibLZMA REQUIRED)
       find_package(BZip2 REQUIRED)
     endif()
   else()
     option(DD4HEP_HEPMC3_COMPRESSION_SUPPORT "Enable reading of compressed HepMC files" OFF)
-    if(${DD4HEP_HEPMC3_COMPRESSION_SUPPORT})
+    if(DD4HEP_HEPMC3_COMPRESSION_SUPPORT)
       message(FATAL "HepMC3 v3.2.5 is required for -DDD4HEP_HEPMC3_COMPRESSION_SUPPORT=ON")
     endif()
   endif()
diff --git a/DDTest/CMakeLists.txt b/DDTest/CMakeLists.txt
index a2b7d56ff0d2e1e9aab229a92871301a76621315..d3871b0a0a837d06593d1b12e15066789d37fbd4 100644
--- a/DDTest/CMakeLists.txt
+++ b/DDTest/CMakeLists.txt
@@ -60,7 +60,7 @@ if (DD4HEP_USE_GEANT4)
   if(DD4HEP_USE_HEPMC3)
     set(TEST_HEPMC3_EXTENSIONS)
 
-    if(${DD4HEP_HEPMC3_COMPRESSION_SUPPORT})
+    if(DD4HEP_HEPMC3_COMPRESSION_SUPPORT)
       file(ARCHIVE_CREATE
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Pythia_output.hepmc.gz
         PATHS ${CMAKE_CURRENT_SOURCE_DIR}/inputFiles/Pythia_output.hepmc