diff --git a/CMakeLists.txt b/CMakeLists.txt index 08a7b55..6798f14 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,11 +25,9 @@ download_project(PROJ POLYSCOPE PREFIX ${EXTERNAL_DEPS_DIR} ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) -if(NOT EXISTS ${POLYSCOPE_BINARY_DIR}) add_subdirectory(${POLYSCOPE_SOURCE_DIR} ${POLYSCOPE_BINARY_DIR}) add_compile_definitions(POLYSCOPE_DEFINED) endif() -endif() #dlib set(DLIB_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/dlib_bin) @@ -50,6 +48,7 @@ download_project(PROJ vcglib_devel PREFIX ${EXTERNAL_DEPS_DIR} ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) +add_subdirectory(${vcglib_devel_SOURCE_DIR} ${vcglib_devel_BINARY_DIR}) ##matplot++ lib download_project(PROJ MATPLOTPLUSPLUS @@ -100,10 +99,13 @@ target_include_directories(${PROJECT_NAME} ) if(${MYSOURCES_STATIC_LINK}) + message("Linking statically") target_link_libraries(${PROJECT_NAME} -static Eigen3::Eigen matplot dlib::dlib ThreedBeamFEA ${TBB_BINARY_DIR}/libtbb_static.a pthread) -elseif(${USE_POLYSCOPE}) - target_link_libraries(${PROJECT_NAME} Eigen3::Eigen matplot dlib::dlib glad ThreedBeamFEA tbb pthread polyscope) else() - target_link_libraries(${PROJECT_NAME} Eigen3::Eigen matplot dlib::dlib glad ThreedBeamFEA tbb pthread) + target_link_libraries(${PROJECT_NAME} Eigen3::Eigen matplot dlib::dlib ThreedBeamFEA tbb pthread) + if(${USE_POLYSCOPE}) + target_link_libraries(${PROJECT_NAME} polyscope) + endif() endif() + target_link_directories(MySources PUBLIC ${CMAKE_CURRENT_LIST_DIR}/boost_graph/libs)