diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcdfa5a..919d71d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,15 +53,18 @@
   ${SectionSources} 
   ${EDKSources}
 )
-add_executable(cper-convert cli-app/cper-convert.c)
-add_executable(cper-generate 
-  generator/cper-generate-cli.c
+add_library(cper-generate STATIC 
   generator/cper-generate.c 
   generator/gen-utils.c 
   common-utils.c
   ${GeneratorSectionSources} 
   ${EDKSources}
 )
+add_executable(cper-convert cli-app/cper-convert.c)
+add_executable(cper-generate-cli 
+  generator/cper-generate-cli.c
+  ${EDKSources}
+)
 add_executable(cper-tests 
   tests/ir-tests.cpp 
   tests/test-utils.cpp
@@ -72,12 +75,14 @@
   ${EDKSources}
 )
 
-# Link library.
+# Linking, compile & property setup for targets.
 target_link_libraries(cper-tests cper-parse json-c GTest::gtest_main)
 target_link_libraries(cper-parse json-c b64c)
 target_link_libraries(cper-convert cper-parse)
+target_link_libraries(cper-generate-cli cper-generate)
 target_compile_options(cper-parse PRIVATE -Wno-address-of-packed-member)
 target_compile_options(cper-tests PRIVATE -fpermissive)
+set_target_properties(cper-generate-cli PROPERTIES OUTPUT_NAME "cper-generate")
 
 # Copy required specification JSON for command line application.
 add_custom_command(TARGET cper-convert POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory bin/specification)