Skip to content

Commit 6daceab

Browse files
committed
[CONF]: Added default conf location
1 parent 747aba0 commit 6daceab

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ endif()
1313
file(GLOB_RECURSE SOURCE_FILES src/*.cpp)
1414
file(GLOB_RECURSE HEADER_FILES src/*.hpp)
1515

16+
set (INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME})
17+
set (CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
18+
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ)
19+
1620
add_subdirectory (3rd/minijson EXCLUDE_FROM_ALL)
1721
add_executable (${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
1822

@@ -23,7 +27,9 @@ target_compile_options (${PROJECT_NAME} PRIVATE -O3 -Werror -Wall -Wextra -pe
2327
target_compile_features (${PROJECT_NAME} PRIVATE cxx_std_17)
2428
target_compile_definitions(${PROJECT_NAME} PRIVATE -DPROG_NAME="${PROJECT_NAME}"
2529
-DCMDLINE_HELP="-h"
26-
-DCMDLINE_CONF="-i" )
30+
-DCMDLINE_CONF="-i"
31+
-DDEFAULT_CONF="${INSTALL_DIR}/default.json")
2732

28-
install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
29-
install (DIRECTORY conf/ TYPE SYSCONF)
33+
install (DIRECTORY DESTINATION ${INSTALL_DIR})
34+
install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${INSTALL_DIR})
35+
install (DIRECTORY conf/ DESTINATION ${INSTALL_DIR})

src/main.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ help(void)
2222
<< "\n\t" << CMDLINE_CONF << " filename : Set configuration file\n\n";
2323
}
2424

25-
static const std::string default_conf{ "/etc/" PROG_NAME };
26-
2725
/*****************************************************************************/
2826
int
2927
main(int argc, char* argv[])
@@ -37,7 +35,7 @@ main(int argc, char* argv[])
3735
}
3836

3937
if (!app.configure(parser->cmdOptionExists(CMDLINE_CONF) ? parser->getCmdOption(CMDLINE_CONF)
40-
: default_conf)) {
38+
: DEFAULT_CONF)) {
4139
std::cerr << app.what() << '\n';
4240
return EXIT_FAILURE;
4341
}

0 commit comments

Comments
 (0)