fix: use build folder for conan artifacts · expresscpp/expresscpp@e74c356 · GitHub

expresscpp / expresscpp Public

• Notifications You must be signed in to change notification settings
• Fork 15
• Star 96

• Code
• Issues 5
• Pull requests 2
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit e74c356

Browse filesBrowse the repository at this point in the historyBrowse files

hpsware

committed

fix: use build folder for conan artifacts

1 parent 5ce9068 commit e74c356
Copy full SHA for e74c356

1 file changed

+2-2Lines changed: 2 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• CMakeLists.txt

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎CMakeLists.txt‎

Copy file name to clipboardExpand all lines: CMakeLists.txt

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -120,13 +120,13 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
120	120	if(EXPRESSCPP_USE_CONAN_DEPENDENCIES)
121	121	# Run conan install from within CMake
122	122	execute_process(
123		- COMMAND conan install ${CMAKE_SOURCE_DIR} --build=missing --install-folder=${CMAKE_BINARY_DIR}/conan # Specify the install folder
	123	+ COMMAND conan install ${CMAKE_SOURCE_DIR} --build=missing -of=${CMAKE_BINARY_DIR}/conan # Specify the install folder
124	124	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
125	125	RESULT_VARIABLE CONAN_RESULT
126	126	)
127	127	message(STATUS "using conan dependencies")
128	128	# Include the Conan toolchain file generated by conan
129		- include(${CMAKE_SOURCE_DIR}/conan_toolchain.cmake)
	129	+ include(${CMAKE_BINARY_DIR}/conan/conan_toolchain.cmake)
130	130	else()
131	131	message(STATUS "EXPRESSCPP: not calling conan from cmake")
132	132	endif()

0 commit comments

Comments

0 (0)