qt as conan dependency
This commit is contained in:
		@@ -10,7 +10,7 @@ cmake:
 | 
				
			|||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - mkdir build
 | 
					    - mkdir build
 | 
				
			||||||
    - cd build
 | 
					    - cd build
 | 
				
			||||||
    - conan install ..
 | 
					    - conan install .. --build=missing
 | 
				
			||||||
    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
 | 
					    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
 | 
				
			||||||
  artifacts:
 | 
					  artifacts:
 | 
				
			||||||
    paths:
 | 
					    paths:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -97,14 +97,12 @@ message(STATUS "Config of Libraries")
 | 
				
			|||||||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 | 
					include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 | 
				
			||||||
conan_basic_setup(TARGETS)
 | 
					conan_basic_setup(TARGETS)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
if (${GUI})
 | 
					if (${GUI})
 | 
				
			||||||
    set(CMAKE_AUTOMOC ON)
 | 
					    set(CMAKE_AUTOMOC ON)
 | 
				
			||||||
    set(CMAKE_INCLUDE_CURRENT_DIR ON)
 | 
					    set(CMAKE_INCLUDE_CURRENT_DIR ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    find_package(Qt5Widgets REQUIRED)
 | 
					    # Find the QtWidgets library
 | 
				
			||||||
    find_package(Qt5PrintSupport REQUIRED)
 | 
					    find_package(Qt5 REQUIRED COMPONENTS Widgets)
 | 
				
			||||||
    find_package(Qt5Sql REQUIRED)
 | 
					 | 
				
			||||||
endif ()
 | 
					endif ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include_directories(inc)
 | 
					include_directories(inc)
 | 
				
			||||||
@@ -182,7 +180,7 @@ if (${GUI})
 | 
				
			|||||||
    endif ()
 | 
					    endif ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # LINK generated LIBS #
 | 
					    # LINK generated LIBS #
 | 
				
			||||||
    target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig ${QT5_LIBRARIES})
 | 
					    target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api CONAN_PKG::libcurl CONAN_PKG::LibConfig CONAN_PKG::libQt5Widgets})
 | 
				
			||||||
endif ()
 | 
					endif ()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# setting install targets
 | 
					# setting install targets
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,7 @@
 | 
				
			|||||||
 [requires]
 | 
					 [requires]
 | 
				
			||||||
 libcurl/7.72.0@prebuiltconanbinaries/stable
 | 
					 libcurl/7.72.0
 | 
				
			||||||
 | 
					 qt/5.15.1@bincrafters/stable
 | 
				
			||||||
 | 
					 openssl/1.1.1h
 | 
				
			||||||
 LibConfig/1.7.2@prebuiltconanbinaries/stable
 | 
					 LibConfig/1.7.2@prebuiltconanbinaries/stable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 [generators]
 | 
					 [generators]
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user