ecal/ecal_defs.h renamed to ecal/defs.h

.gitignore

@@ -17,7 +17,7 @@ Thumbs.db
 /thirdparty/npcap/
 
 # autogenerated files
-/ecal/include/ecal/ecal_defs.h
+/ecal/include/ecal/defs.h
 
 # Doxygen output
 /doc/*.tmp

app/mon/mon_gui/src/plugin/plugin_manager.cpp

@@ -28,7 +28,7 @@
 #include <QProcessEnvironment>
 
 #include <ecal/log.h>
-#include <ecal/ecal_defs.h>
+#include <ecal/defs.h>
 
 std::unique_ptr<PluginManager> PluginManager::instance_;
 

app/rec/rec_client_core/src/addons/addon_manager.cpp

@@ -26,7 +26,7 @@
 
 #include <list>
 
-#include <ecal/ecal_defs.h>
+#include <ecal/defs.h>
 
 namespace eCAL
 {

ecal/core/CMakeLists.txt

@@ -39,9 +39,9 @@ endif()
 # If we're currently doing a build within a git repository, we will configure the header files.
 # Else, (e.g. for source packages such as debian source packages) we will use a preconfigured file.
 # If there is really no information available, it will generate a dummy version file 0.0.0
-if     (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/ecal_defs.h")
-  configure_file(src/ecal_defs.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h" @ONLY)
-endif  (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/ecal_defs.h")
+if     (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/defs.h")
+  configure_file(src/defs.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/ecal/defs.h" @ONLY)
+endif  (IS_GIT_TREE OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/ecal/defs.h")
 
 if(UNIX)
  include (CheckSymbolExists)
@@ -602,7 +602,7 @@ set(ecal_sources
 
 ecal_add_shared_library(${TARGET_NAME}
     ${ecal_sources}
-    ${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h
+    ${CMAKE_CURRENT_BINARY_DIR}/include/ecal/defs.h
 )
 
 if (ECAL_CORE_CONFIGURATION)
@@ -758,7 +758,7 @@ install(DIRECTORY
    "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
     FILES_MATCHING PATTERN "*.h")
 
-# install generated ecal_defs.h file    
+# install generated defs.h file    
 install(DIRECTORY
    "${CMAKE_CURRENT_BINARY_DIR}/include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
     FILES_MATCHING PATTERN "*.h")

ecal/core/src/ecal_defs.h.in → ecal/core/src/defs.h.in

@@ -18,12 +18,12 @@
 */
 
 /**
- * @file   ecal_defs.h
+ * @file   defs.h
  * @brief  eCAL core defines (version numbers)
 **/
 
-#ifndef ecal_defs_h_included
-#define ecal_defs_h_included
+#ifndef defs_h_included
+#define defs_h_included
 #define ECAL_VERSION_MAJOR (@GIT_REVISION_MAJOR@)
 #define ECAL_VERSION_MINOR (@GIT_REVISION_MINOR@)
 #define ECAL_VERSION_PATCH (@GIT_REVISION_PATCH@)
@@ -41,4 +41,4 @@
 #define ECAL_INSTALL_INCLUDE_DIR "@eCAL_install_include_dir@"
 #define ECAL_INSTALL_PREFIX      "@CMAKE_INSTALL_PREFIX@"
 
-#endif // ecal_defs_h_included
+#endif // defs_h_included