From 1212f009d00aa1c0e5d647b1cafc69a2a9bfb51f Mon Sep 17 00:00:00 2001
From: Daniel Lyubomirov <daniel.lyubomirov@vereign.com>
Date: Mon, 15 Jun 2020 13:46:35 +0300
Subject: [PATCH] clean cmake configuration
---
cpp/CMakeLists.txt | 4 +---
cpp/vendor/fmt.cmake | 21 ---------------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 6989dc4..b714770 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -88,10 +88,8 @@ message("CXX dll linker flags: " "${CMAKE_SHARED_LINKER_FLAGS}")
message("CXX static linker flags: " "${CMAKE_STATIC_LINKER_FLAGS}")
string(TOLOWER "${CMAKE_BUILD_TYPE}" _build_type)
-set(VENDOR_INSTALL_DIR ${CMAKE_SOURCE_DIR}/cmake-install-vendor-debug CACHE STRING "vendor directory")
-# set(VENDOR_INSTALL_DIR ${CMAKE_SOURCE_DIR}/cmake-install-vendor-${_build_type} CACHE STRING "vendor directory")
+set(VENDOR_INSTALL_DIR ${CMAKE_SOURCE_DIR}/cmake-install-vendor-${_build_type} CACHE STRING "vendor directory")
message(STATUS "Using vendor install dir: ${VENDOR_INSTALL_DIR}")
-#set(VENDOR_INSTALL_DIR /home/daniel/workspace/local)
set(_cmake_prefix_paths
${VENDOR_INSTALL_DIR}
${VENDOR_INSTALL_DIR}/grpc
diff --git a/cpp/vendor/fmt.cmake b/cpp/vendor/fmt.cmake
index 804c049..55359ac 100644
--- a/cpp/vendor/fmt.cmake
+++ b/cpp/vendor/fmt.cmake
@@ -1,11 +1,3 @@
-# set(FETCHCONTENT_QUIET OFF)
-# set(FETCHCONTENT_BASE_DIR "${CMAKE_SOURCE_DIR}/cmake-build-vendor")
-# FetchContent_Declare(
-# fmt
-# GIT_REPOSITORY git@github.com:fmtlib/fmt.git
-# GIT_TAG 6.2.0
-# )
-# FetchContent_MakeAvailable(fmt)
ExternalProject_Add(fmtlib
PREFIX fmt
@@ -34,16 +26,3 @@ ExternalProject_Add(fmtlib
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DFMT_TEST:BOOL=OFF
)
-
-# ExternalProject_Get_Property(fmtlib INSTALL_DIR)
-# set(FMT_LIB ${INSTALL_DIR} PARENT_SCOPE)
-#
-# add_library(fmt STATIC IMPORTED GLOBAL)
-# set_property(TARGET fmt PROPERTY IMPORTED_LOCATION_DEBUG ${INSTALL_DIR}/lib/libfmtd.a)
-# set_property(TARGET fmt PROPERTY IMPORTED_LOCATION_RELEASE ${INSTALL_DIR}/lib/libfmt.a)
-# target_include_directories(fmt INTERFACE
-# $<BUILD_INTERFACE:${INSTALL_DIR}/include>
-## $<INSTALL_INTERFACE:include/mylib> # <prefix>/include/mylib
-# )
-# add_dependencies(fmt fmtlib)
-
--
GitLab