From 77df1f06d7a60f8a8b23f362344f256608cc20bf Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Wed, 7 Apr 2021 00:42:46 +0300
Subject: cmake: slight CMakeLists.txt refactoring
---
CMakeLists.txt | 5 +++--
test/CMakeLists.txt | 2 --
test/unit_tests/CMakeLists.txt | 16 +++++++++++-----
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f86a3a9..6a08d9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.5) # for Boost::* imported targets
project(pdb_repo CXX)
-
enable_testing()
if(MSVC)
@@ -36,7 +35,9 @@ add_library(pdb_repo ${pdb_repo_include} ${pdb_repo_src})
target_compile_definitions(pdb_repo PUBLIC _NO_CVCONST_H)
target_include_directories(pdb_repo PUBLIC include/)
target_include_directories(pdb_repo SYSTEM PUBLIC 3rdparty/microsoft/SafeInt)
-target_link_libraries(pdb_repo PUBLIC Boost::boost PRIVATE Boost::nowide)
+target_link_libraries(pdb_repo
+ PUBLIC Boost::boost
+ PRIVATE Boost::disable_autolinking Boost::nowide)
target_link_libraries(pdb_repo PRIVATE dbghelp)
if(MINGW)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 137936a..87697fe 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,14 +3,12 @@ target_link_libraries(test_lib PRIVATE pdb_repo)
target_link_libraries(test_lib PRIVATE Boost::nowide)
target_include_directories(test_lib PUBLIC .)
target_compile_definitions(test_lib PRIVATE TEST_LIB_EXPORTS)
-
install(TARGETS test_lib RUNTIME DESTINATION bin/test)
install_pdbs(TARGETS test_lib DESTINATION bin/test)
add_executable(call_stack call_stack.cpp)
target_link_libraries(call_stack PRIVATE test_lib)
target_link_libraries(call_stack PRIVATE Boost::nowide)
-
install(TARGETS call_stack RUNTIME DESTINATION bin/test)
install_pdbs(TARGETS call_stack DESTINATION bin/test)
diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt
index 135087b..bfeab62 100644
--- a/test/unit_tests/CMakeLists.txt
+++ b/test/unit_tests/CMakeLists.txt
@@ -2,15 +2,21 @@ find_package(Boost REQUIRED COMPONENTS filesystem unit_test_framework)
add_executable(unit_tests main.cpp call_stack.cpp dbghelp.cpp error.cpp)
target_link_libraries(unit_tests PRIVATE pdb_repo test_lib)
-target_link_libraries(unit_tests PRIVATE Boost::disable_autolinking Boost::filesystem Boost::nowide Boost::unit_test_framework)
-
+target_link_libraries(unit_tests PRIVATE
+ Boost::disable_autolinking
+ Boost::filesystem
+ Boost::nowide
+ Boost::unit_test_framework)
install(TARGETS unit_tests RUNTIME DESTINATION bin/test)
install_pdbs(TARGETS unit_tests DESTINATION bin/test)
if(MSVC)
# Set the working directory so that the unit_tests binary can find the
# test_lib shared library binary.
- add_test(NAME unit_tests
- COMMAND unit_tests --log_level=all --no_color_output -- --test_lib_pdb "$<TARGET_PDB_FILE:test_lib>"
- WORKING_DIRECTORY "$<TARGET_FILE_DIR:test_lib>")
+ add_test(NAME unit_tests COMMAND unit_tests
+ --log_level=all
+ --no_color_output
+ --
+ --test_lib_pdb "$<TARGET_PDB_FILE:test_lib>"
+ WORKING_DIRECTORY "$<TARGET_FILE_DIR:test_lib>")
endif()
--
cgit v1.2.3