Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
Vereign Client Library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Code
Vereign Client Library
Commits
1212f009
Verified
Commit
1212f009
authored
5 years ago
by
Daniel Lyubomirov
Browse files
Options
Downloads
Patches
Plain Diff
clean cmake configuration
parent
20dd8869
No related branches found
No related tags found
1 merge request
!96
C API integration layer
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cpp/CMakeLists.txt
+1
-3
1 addition, 3 deletions
cpp/CMakeLists.txt
cpp/vendor/fmt.cmake
+0
-21
0 additions, 21 deletions
cpp/vendor/fmt.cmake
with
1 addition
and
24 deletions
cpp/CMakeLists.txt
+
1
−
3
View file @
1212f009
...
@@ -88,10 +88,8 @@ message("CXX dll linker flags: " "${CMAKE_SHARED_LINKER_FLAGS}")
...
@@ -88,10 +88,8 @@ message("CXX dll linker flags: " "${CMAKE_SHARED_LINKER_FLAGS}")
message
(
"CXX static linker flags: "
"
${
CMAKE_STATIC_LINKER_FLAGS
}
"
)
message
(
"CXX static linker flags: "
"
${
CMAKE_STATIC_LINKER_FLAGS
}
"
)
string
(
TOLOWER
"
${
CMAKE_BUILD_TYPE
}
"
_build_type
)
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
}
"
)
message
(
STATUS
"Using vendor install dir:
${
VENDOR_INSTALL_DIR
}
"
)
#set(VENDOR_INSTALL_DIR /home/daniel/workspace/local)
set
(
_cmake_prefix_paths
set
(
_cmake_prefix_paths
${
VENDOR_INSTALL_DIR
}
${
VENDOR_INSTALL_DIR
}
${
VENDOR_INSTALL_DIR
}
/grpc
${
VENDOR_INSTALL_DIR
}
/grpc
...
...
This diff is collapsed.
Click to expand it.
cpp/vendor/fmt.cmake
+
0
−
21
View file @
1212f009
# 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
ExternalProject_Add
(
fmtlib
PREFIX fmt
PREFIX fmt
...
@@ -34,16 +26,3 @@ ExternalProject_Add(fmtlib
...
@@ -34,16 +26,3 @@ ExternalProject_Add(fmtlib
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DFMT_TEST:BOOL=OFF
-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)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment