Merge branch 'release/0.8.0'

[hubacji1/rrts.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cac3768984d1b0391ba612756fe762b4a853704..0165814cdc0c3999186ad6f2c3f69eb27b9ac692 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,42 +4,29 @@ project(rrts)
 #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)
-
-include_directories(../bcar/api)
-link_directories(../../bcar/build)
+if (NOT TARGET bcar)
+       set(SKIP_UT TRUE)
+       add_subdirectory(bcar)
+       unset(SKIP_UT)
+endif()
 link_libraries(bcar)
+link_libraries(pslot)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/incl)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/api)
-
-add_library(rrts SHARED
-        src/rrts.cc
-        src/rrtext8.cc
-        src/rrtext7.cc
-        src/rrtext6.cc
-        src/rrtext5.cc
-        src/rrtext4.cc
-        src/rrtext3.cc
-        src/rrtext2.cc
-        src/rrtext1.cc
-        src/reeds_shepp.cpp
-)
-set_target_properties(rrts PROPERTIES
-        PUBLIC_HEADER api/rrts.h
-)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wvtest/cpp)
-ADD_DEFINITIONS(-DWVTEST_CONFIGURED)
-add_executable(ut
-        wvtest/cpp/wvtestmain.cc
-        wvtest/cpp/wvtest.cc
-        ut/rrts.t.cc
-        ut/rrtext.t.cc
-)
-target_link_libraries(ut rrts)
+find_package(jsoncpp REQUIRED)
+link_libraries(jsoncpp_lib)
 
-add_custom_command(TARGET ut
-        POST_BUILD COMMAND ./wvtestrun ../build/ut
-        WORKING_DIRECTORY ../wvtest
+add_library(rrts STATIC
+       src/rrts.cc
+       src/rrtext18.cc
+       src/rrtext17.cc
+       src/rrtext16.cc
+       src/rrtext15.cc
+       src/rrtext14.cc
+       src/rrtext13.cc
+       src/rrtext10.cc
+       src/rrtext8.cc
+       src/rrtext6.cc
+       src/rrtext2.cc
+       src/reeds_shepp.cpp
 )
+target_include_directories(rrts PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/incl)