diff --git a/CMakeLists.txt b/CMakeLists.txt index 1907c14f..837ef9df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,6 @@ else() set(APP_VERSION "${version_txt}") endif() -STRING(REGEX REPLACE "[^a-zA-Z0-9_]" "_" APP_VERSION_NAMESPACE "v${APP_VERSION}") - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake diff --git a/include/common.hpp b/include/common.hpp index e29ef35b..6da08c49 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -8,10 +8,8 @@ #include "settings.hpp" #define POLYBAR_NS \ - namespace polybar { \ - inline namespace APP_VERSION_NAMESPACE { + namespace polybar { #define POLYBAR_NS_END \ - } \ } #ifndef PIPE_READ diff --git a/include/settings.hpp.cmake b/include/settings.hpp.cmake index 34713b0d..73882477 100644 --- a/include/settings.hpp.cmake +++ b/include/settings.hpp.cmake @@ -6,7 +6,6 @@ #define APP_NAME "@PROJECT_NAME@" #cmakedefine APP_VERSION "@APP_VERSION@" -#cmakedefine APP_VERSION_NAMESPACE @APP_VERSION_NAMESPACE@ #cmakedefine01 ENABLE_ALSA #cmakedefine01 ENABLE_MPD