Update cmake lists

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88595f403cb3bc9365e72bd04279a47f84233d1b..e6d5ebc36b8e2901a95400830de02d46497be9ac 100644 (file)
--- 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
 )