Skip to content

Remove the googletest include dir from every module instead of scoping it #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luapmartin wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −15
Open

Remove the googletest include dir from every module instead of scoping it #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions buildscripts/cmake/DeclareModuleSetup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ function(muse_create_module target_name)
set(MUSE_FRAMEWORK_PATH ${PROJECT_SOURCE_DIR})
endif()

get_property(_gtest_src GLOBAL PROPERTY googletest_SOURCE_DIR)
target_include_directories(${target_name} PRIVATE
${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
Expand All @@ -81,7 +80,6 @@ function(muse_create_module target_name)
${MUSE_FRAMEWORK_PATH}
${MUSE_FRAMEWORK_PATH}/framework
${MUSE_FRAMEWORK_PATH}/framework/global
${_gtest_src}/googletest/googletest/include

# compat
${MUSE_FRAMEWORK_PATH}/src
Expand Down
2 changes: 0 additions & 2 deletions framework/cmake/MuseCreateModule.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ function(muse_create_module target_name)
set(MUSE_FRAMEWORK_PATH ${PROJECT_SOURCE_DIR})
endif()

get_property(_gtest_src GLOBAL PROPERTY googletest_SOURCE_DIR)
target_include_directories(${target_name} PRIVATE
${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
Expand All @@ -93,7 +92,6 @@ function(muse_create_module target_name)
${MUSE_FRAMEWORK_PATH}
${MUSE_FRAMEWORK_PATH}/framework
${MUSE_FRAMEWORK_PATH}/framework/global
${_gtest_src}/googletest/googletest/include

# compat
${MUSE_FRAMEWORK_PATH}/src
Expand Down
14 changes: 3 additions & 11 deletions framework/global/logremover.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
#ifndef MU_LOGREMOVER_H
#define MU_LOGREMOVER_H

#include "muse_framework_config.h"

#ifdef MUSE_ENABLE_UNIT_TESTS
#include <gtest/gtest_prod.h>
#endif

#include "types/string.h"
#include "types/datetime.h"
#include "io/path.h"
Expand All @@ -39,14 +33,12 @@ class LogRemover

static void removeLogs(const io::path_t& logsDir, int olderThanDays, const String& pattern);

private:
//! Public so it can be unit tested directly, without FRIEND_TEST / gtest_prod.h
static Date parseDate(const String& fileName);

#ifdef MUSE_ENABLE_UNIT_TESTS
FRIEND_TEST(Global_LogRemoverTests, ParseDate);
#endif
private:

static void scanDir(const io::path_t& logsDir, io::paths_t& files);
static Date parseDate(const String& fileName);
static void removeFiles(const io::paths_t& files);
};
}
Expand Down