Merge pull request #685 from claudioperez/contrib-src

cmp - CMake; no longer link found Tcl if Conan has been run.
zhuminjie · Oct 17, 2021 · 0b02416 · 0b02416
2 parents 09546da + d2a4aea
commit 0b02416
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -359,15 +359,17 @@ target_link_libraries(OpenSees
     ${MYSQL_LIBRARIES}
 )
 
-target_include_directories(OpenSees PUBLIC ${TCL_INCLUDE_PATH})
 
 #----------------------------
 # OPS_Interp_Tcl
 #----------------------------
 # Add sources to OPS_Interp_Tcl target
 
-target_include_directories(OPS_Interp_Tcl PUBLIC ${TCL_INCLUDE_PATH})
-target_link_libraries(OPS_Interp_Tcl PRIVATE ${TCL_LIBRARIES})
+if(NOT EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
+  target_include_directories(OpenSees PUBLIC ${TCL_INCLUDE_PATH})
+  target_include_directories(OPS_Interp_Tcl PUBLIC ${TCL_INCLUDE_PATH})
+  target_link_libraries(OPS_Interp_Tcl PRIVATE ${TCL_LIBRARIES})
+endif()
 
 target_compile_definitions(OPS_Interp_Tcl PUBLIC _TCL85)