Fix CMakeLists file name +fix define namespace when compiling without…

… namespace
OlivierLDff · Dec 10, 2018 · 2a3da69 · 2a3da69
1 parent 546d5d7
commit 2a3da69
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/CMakelists.txt → CMakeLists.txt b/CMakelists.txt → CMakeLists.txt
@@ -57,7 +57,7 @@ SET( QSUPER_MACROS_NAMESPACE "Qsm" CACHE STRING "Namespace for the library. Only
 SET( QSUPER_MACROS_BUILD_DOC OFF CACHE BOOL "Build QSuperMacros Doc with Doxygen" )
 IF(QSUPER_MACROS_BUILD_DOC)
 SET( QSUPER_MACROS_DOXYGEN_BT_REPOSITORY "https://github.com/OlivierLDff/DoxygenBootstrappedCMake.git" CACHE STRING "Repository of DoxygenBt" )
-SET( QSUPER_MACROS_DOXYGEN_BT_TAG v1.3.1 CACHE STRING "Git Tag of DoxygenBt" )
+SET( QSUPER_MACROS_DOXYGEN_BT_TAG v1.3.2 CACHE STRING "Git Tag of DoxygenBt" )
 ENDIF(QSUPER_MACROS_BUILD_DOC)
 
 SET( QSUPER_MACROS_USE_QT_PREFIX OFF CACHE BOOL "Use Qt-ish internal attribute prefix m_attribute [ON OFF]" )
@@ -96,7 +96,7 @@ FIND_PACKAGE(Qt5Qml REQUIRED)
 # Project version must be set here
 SET(QSUPER_MACROS_VERSION_MAJOR 1)
 SET(QSUPER_MACROS_VERSION_MINOR 0)
-SET(QSUPER_MACROS_VERSION_PATCH 0)
+SET(QSUPER_MACROS_VERSION_PATCH 1)
 SET(QSUPER_MACROS_VERSION ${QSUPER_MACROS_VERSION_MAJOR}.${QSUPER_MACROS_VERSION_MINOR}.${QSUPER_MACROS_VERSION_PATCH} CACHE STRING "Version")
 
 IF( EXISTS "${CMAKE_SOURCE_DIR}/.git" )

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ A set of one-line C++ macros to simplify the creation of reccurent things (like
 ## Dependencies
 
 - [Doxygen](https://github.com/doxygen/doxygen) : To generate the documentation.
-- [DoxygenBootstrapped](https://github.com/OlivierLDff/DoxygenBootstrapped) : Integrate doxygen with CMake. *v1.3.1*.
+- [DoxygenBootstrapped](https://github.com/OlivierLDff/DoxygenBootstrapped) : Integrate doxygen with CMake. *v1.3.2*.
 
 ## API
 
@@ -87,7 +87,7 @@ make
 ### Dependencies
 
 - **QSUPER_MACROS_DOXYGEN_BT_REPOSITORY** : Repository of DoxygenBt. *Default : "https://github.com/OlivierLDff/DoxygenBootstrapped.git"*
-- **QSUPER_MACROS_DOXYGEN_BT_TAG** : Git Tag of DoxygenBt. *Default : "v1.3.1"*
+- **QSUPER_MACROS_DOXYGEN_BT_TAG** : Git Tag of DoxygenBt. *Default : "v1.3.2"*
 
 ### Output
 
@@ -123,7 +123,7 @@ SET( QSUPER_MACROS_BUILD_STATIC ON )
 SET( QSUPER_MACROS_BUILD_DOC OFF )
 SET( QSUPER_MACROS_USE_NAMESPACE ON )
 SET( QSUPER_MACROS_REPOSITORY "https://github.com/OlivierLDff/QSuperMacros.git" )
-SET( QSUPER_MACROS_TAG v1.0.0 )
+SET( QSUPER_MACROS_TAG v1.0.1 )
 INCLUDE(path/to/BuildQSuperMacros.cmake)
 ```
 

diff --git a/src/QSuperMacros.h b/src/QSuperMacros.h
@@ -53,8 +53,8 @@
 /** Use the namespace. Using this macro give the same result no matters if the library is compiled with or without a namespace */
 #define QSUPER_MACROS_USING_NAMESPACE using namespace QSUPER_MACROS_NAMESPACE;
 #else
-#undef QSUPER_MACROS_NAMESPACE_NAME
-#define QSUPER_MACROS_NAMESPACE_NAME
+#undef QSUPER_MACROS_NAMESPACE
+#define QSUPER_MACROS_NAMESPACE
 /** Start of the namespace declaratio. Using this macro give the same result no matters if the library is compiled with or without a namespace */
 #define QSUPER_MACROS_NAMESPACE_START
 /** End of the namespace declaration. Using this macro give the same result no matters if the library is compiled with or without a namespace */