mirror of
https://github.com/p-ranav/indicators.git
synced 2025-12-16 04:18:51 +08:00
Resolved merge conflicts
This commit is contained in:
@@ -4,9 +4,9 @@ if(DEFINED PROJECT_NAME)
|
|||||||
set(INDICATORS_SUBPROJECT ON)
|
set(INDICATORS_SUBPROJECT ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
project(indicators VERSION 1.8.0 LANGUAGES CXX
|
project(indicators VERSION 1.8.0 LANGUAGES CXX)
|
||||||
HOMEPAGE_URL "https://github.com/p-ranav/indicators"
|
# HOMEPAGE_URL "https://github.com/p-ranav/indicators"
|
||||||
DESCRIPTION "Activity Indicators for Modern C++")
|
# DESCRIPTION "Activity Indicators for Modern C++")
|
||||||
|
|
||||||
if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
||||||
include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
||||||
|
|||||||
Reference in New Issue
Block a user