Fix private member name

[hubacji1/iamcar2.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 234483612ace6d4b7e04a86b05b69fc8442e8532..a716ceee0c9859c805e36f78db1b2def4d4cdbfc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,57 +1,44 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.8)
 project(iamcar2)
+set(CMAKE_BUILD_TYPE "Debug")
 
-#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-#set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
 
-link_libraries(jsoncpp)
+find_package(jsoncpp REQUIRED)
 find_package(Threads)
+
+add_executable(cleanup_scenario src/cleanup_scenario.cc)
+target_link_libraries(cleanup_scenario jsoncpp_lib)
+
+link_libraries(jsoncpp_lib)
 link_libraries(${CMAKE_THREAD_LIBS_INIT})
 
-include_directories(../bcar/api)
-link_directories(../../bcar/build)
+if (NOT TARGET pslot)
+       set(SKIP_UT TRUE)
+       add_subdirectory(bcar)
+       unset(SKIP_UT)
+endif()
+
+if (NOT TARGET rrts)
+       set(SKIP_UT TRUE)
+       add_subdirectory(rrts)
+       unset(SKIP_UT)
+endif()
+
 link_libraries(bcar)
 link_libraries(pslot)
+link_libraries(rrts)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/incl)
 
-include_directories(../psp/api)
-link_directories(../../psp/build)
-link_libraries(psp)
+add_executable(test51 src/template.cc)
+target_compile_definitions(test51 PRIVATE OSP=P37)
 
-include_directories(../rrts/api)
-link_directories(../../rrts/build)
-link_libraries(rrts)
+add_executable(test52 src/template-with-reset.cc)
+target_compile_definitions(test52 PRIVATE OSP=P36)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/incl)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/api)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wvtest/cpp)
-ADD_DEFINITIONS(-DWVTEST_CONFIGURED)
-add_executable(ut
-        wvtest/cpp/wvtestmain.cc
-        wvtest/cpp/wvtest.cc
-        ut/test1.t.cc
-)
-
-add_custom_command(TARGET ut
-        POST_BUILD COMMAND ./wvtestrun ../build/ut
-        WORKING_DIRECTORY ../wvtest
-)
-
-add_executable(test1 src/test1.cc)
-add_executable(test2 src/test2.cc)
-add_executable(test3 src/test3.cc)
-add_executable(test4 src/test4.cc)
-add_executable(test5 src/test5.cc)
-add_executable(test6 src/test6.cc)
-add_executable(test7 src/test7.cc)
-add_executable(test8 src/test8.cc)
-add_executable(test9 src/test9.cc)
-add_executable(test10 src/test10.cc)
-add_executable(test11 src/test11.cc)
-add_executable(test12 src/test12.cc)
-add_executable(test13 src/test13.cc)
-add_executable(test14 src/test14.cc)
-add_executable(test15 src/test15.cc)
-add_executable(test16 src/test16.cc)
-add_executable(test17 src/test17.cc)
-add_executable(test18 src/test18.cc)
+add_executable(test53 src/template.cc)
+target_compile_definitions(test53 PRIVATE OSP=P38)
+
+add_executable(test54 src/template-with-reset.cc)
+target_compile_definitions(test54 PRIVATE OSP=P39)