diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae3df2a49f570379784be49007b6d77321248a56..e46d6c9dfde8352b127950323d6cda0660b990bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ add_executable(smart_grid.exe
     src/apps/smart_grid/SmgStateMachine.cpp
     src/apps/smart_grid/SmartOpcServer.cpp
     src/smart_grid/SmartGridModel.cpp
-    # src/smart_grid/StateLogger.cpp
     src/i2c/Node.cpp
     src/com/Socket.cpp
     src/com/Protocol.cpp
@@ -49,18 +48,22 @@ target_include_directories(smart_grid.exe PUBLIC libs/freeopcua/include)
 target_link_libraries(smart_grid.exe opcuacore opcuaserver)
 
 # Add OPC UA
-# macro(SET_OPTION option value)
-#   set(${option} ${value} CACHE "" INTERNAL FORCE)
-# endmacro()
-# option(BUILD_CLIENT "Build Client" OFF)
-# option(BUILD_SERVER "Build Server" ON)
+if(BUILD_OPC_UA_FOR_INSTALL)
+    
 
-# option(SSL_SUPPORT_MBEDTLS "Support rsa-oaep password encryption using mbedtls library " OFF)
+macro(SET_OPTION option value)
+set(${option} ${value} CACHE "" INTERNAL FORCE)
+endmacro()
+option(BUILD_CLIENT "Build Client" OFF)
+option(BUILD_SERVER "Build Server" ON)
 
-# option(BUILD_PYTHON "Build Python bindings" OFF)
-# option(BUILD_TESTING "Build and run tests" OFF)
-# option(BUILD_SHARED_LIBS "Build shared libraries." ON)
-# add_subdirectory(libs/freeopcua)
+option(SSL_SUPPORT_MBEDTLS "Support rsa-oaep password encryption using mbedtls library " OFF)
+
+option(BUILD_PYTHON "Build Python bindings" OFF)
+option(BUILD_TESTING "Build and run tests" OFF)
+option(BUILD_SHARED_LIBS "Build shared libraries." ON)
+add_subdirectory(libs/freeopcua)
+endif(BUILD_OPC_UA_FOR_INSTALL)
 
 add_executable(opc_server.exe src/apps/SmgOPC_server/opc_server.cpp)
 target_include_directories(opc_server.exe PUBLIC libs/freeopcua/include)