From 120d35d21de1a9f93f35a3539a62a8bedb705508 Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Tue, 13 Jul 2021 13:26:55 +0200 Subject: [PATCH] Update cmake lists --- CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88595f4..e6d5ebc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,21 +1,21 @@ cmake_minimum_required(VERSION 2.8) project(bcar) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/incl) +add_library(bcar STATIC src/bcar.cc) +target_include_directories(bcar PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/incl) -add_library(bcar SHARED src/bcar.cc) -set_target_properties(bcar PROPERTIES PUBLIC_HEADER incl/bcar.hh) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wvtest/cpp) -ADD_DEFINITIONS(-DWVTEST_CONFIGURED) +if (SKIP_UT) + return() +endif() add_executable(ut - wvtest/cpp/wvtestmain.cc - wvtest/cpp/wvtest.cc - ut/bcar.t.cc + wvtest/cpp/wvtestmain.cc + wvtest/cpp/wvtest.cc + ut/bcar.t.cc ) +target_compile_definitions(ut PRIVATE WVTEST_CONFIGURED) +target_include_directories(ut PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/wvtest/cpp) target_link_libraries(ut bcar) - add_custom_command(TARGET ut - POST_BUILD COMMAND ./wvtestrun ../build/ut - WORKING_DIRECTORY ../wvtest + POST_BUILD COMMAND ./wvtestrun ../build/ut + WORKING_DIRECTORY ../wvtest ) -- 2.39.2