File tree Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,10 @@ endif()
13
13
file (GLOB_RECURSE SOURCE_FILES src/*.cpp)
14
14
file (GLOB_RECURSE HEADER_FILES src/*.hpp)
15
15
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
+
16
20
add_subdirectory (3rd/minijson EXCLUDE_FROM_ALL )
17
21
add_executable (${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES} )
18
22
@@ -23,7 +27,9 @@ target_compile_options (${PROJECT_NAME} PRIVATE -O3 -Werror -Wall -Wextra -pe
23
27
target_compile_features (${PROJECT_NAME} PRIVATE cxx_std_17)
24
28
target_compile_definitions (${PROJECT_NAME} PRIVATE -DPROG_NAME="${PROJECT_NAME} "
25
29
-DCMDLINE_HELP="-h"
26
- -DCMDLINE_CONF="-i" )
30
+ -DCMDLINE_CONF="-i"
31
+ -DDEFAULT_CONF="${INSTALL_DIR} /default.json" )
27
32
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} )
Original file line number Diff line number Diff line change @@ -22,8 +22,6 @@ help(void)
22
22
<< " \n\t " << CMDLINE_CONF << " filename : Set configuration file\n\n " ;
23
23
}
24
24
25
- static const std::string default_conf{ " /etc/" PROG_NAME };
26
-
27
25
/* ****************************************************************************/
28
26
int
29
27
main (int argc, char * argv[])
@@ -37,7 +35,7 @@ main(int argc, char* argv[])
37
35
}
38
36
39
37
if (!app.configure (parser->cmdOptionExists (CMDLINE_CONF) ? parser->getCmdOption (CMDLINE_CONF)
40
- : default_conf )) {
38
+ : DEFAULT_CONF )) {
41
39
std::cerr << app.what () << ' \n ' ;
42
40
return EXIT_FAILURE;
43
41
}
You can’t perform that action at this time.
0 commit comments