King_DuckZ/kamokan
1
0
Fork 0
mirror of https://github.com/KingDuckZ/kamokan.git synced 2024-12-27 21:35:41 +00:00
Code Issues Releases Wiki Activity

Remove hardcoded path to my own machine.

Browse source
This commit is contained in:
King_DuckZ 2017-06-05 23:57:47 +01:00
parent 4ba3b679fc
commit 974424398f
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/simulation/CMakeLists.txt
View file

@ -14,6 +14,7 @@ add_executable(${PROJECT_NAME}
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
PRIVATE ${TAWASHI_SOURCE_ROOT}/lib/Catch/single_include PRIVATE ${TAWASHI_SOURCE_ROOT}/lib/Catch/single_include
PRIVATE ${TAWASHI_GEN_INCLUDE_DIR} PRIVATE ${TAWASHI_GEN_INCLUDE_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PRIVATE tawashi PRIVATE tawashi
@ -25,3 +26,8 @@ add_test(
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${PROJECT_NAME} COMMAND ${PROJECT_NAME}
) )
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/simulation_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/simulation_config.h
)

20
test/simulation/simulation_config.h.in Normal file
View file

@ -0,0 +1,20 @@
/* Copyright 2017, Michele Santullo
* This file is part of "kamokan".
*
* "kamokan" is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* "kamokan" is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with "kamokan". If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define KAMOKAN_HTML_PATH "@CMAKE_CURRENT_SOURCE_DIR@/html/website"

3
test/simulation/test_index_response.cpp
View file

@ -21,6 +21,7 @@
#include "ini_file.hpp" #include "ini_file.hpp"
#include "settings_bag.hpp" #include "settings_bag.hpp"
#include "safe_stack_object.hpp" #include "safe_stack_object.hpp"
#include "simulation_config.h"
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include <string> #include <string>
@ -102,7 +103,7 @@ TEST_CASE ("Index response", "[index][response]") {
std::string kamokan_settings( std::string kamokan_settings(
"[kamokan]\n" "[kamokan]\n"
" host_name = 127.0.0.1\n" " host_name = 127.0.0.1\n"
" website_root = /home/michele/dev/code/cpp/kamokan/html\n" " website_root = " KAMOKAN_HTML_PATH "\n"
" logging_level = debug\n" " logging_level = debug\n"
" langmap_dir = /usr/share/source-highlight\n" " langmap_dir = /usr/share/source-highlight\n"
" host_path = /\n" " host_path = /\n"