diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 85e78d7..54a7774 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -1,6 +1,7 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011,2012,2014,2016,2018 Free Software Foundation, Inc.
 #
-# This file is part of GNU Radio
+# This file was generated by gr_modtool, a tool from the GNU Radio framework
+# This file is a part of gr-gsm
 #
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +21,6 @@
 include(GrPython)
 include(GrccCompile)
 add_subdirectory(helpers)
-#add_subdirectory(apps_data)
 
 GRCC_COMPILE(grgsm_livemon)
 GRCC_COMPILE(grgsm_livemon_headless)
@@ -30,13 +30,13 @@
 OPTION(ENABLE_GRGSM_LIVEMON "Compile grgsm_livemon" ON)
 OPTION(ENABLE_GRGSM_LIVEMON_HEADLESS "Compile grgsm_livemon_headless" ON)
 
-if(ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON)
+if(ENABLE_GRC AND ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON)
     list (APPEND grgsm_flowgraphs ${CMAKE_CURRENT_BINARY_DIR}/grgsm_livemon)
-endif(ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON)
+endif()
 
-if(ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON_HEADLESS)
+if(ENABLE_GRC AND ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON_HEADLESS)
     list (APPEND grgsm_flowgraphs ${CMAKE_CURRENT_BINARY_DIR}/grgsm_livemon_headless)
-endif(ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON_HEADLESS)
+endif()
 
 GR_PYTHON_INSTALL(
     PROGRAMS
@@ -50,9 +50,4 @@
 # The add_dependencies(...) is very important for the parallel build `make -j $(nproc)`
 # The `pygen_apps` target is generated in GR_PYTHON_INSTALL function which calls
 # GR_UNIQUE_TARGET that we redefine in GrccCompile.
-add_dependencies(pygen_apps _grgsm_swig)
-
-install(
-    PROGRAMS
-    DESTINATION bin
-)
+add_dependencies(pygen_apps grgsm_swig)