diff --git a/flightlib/CMakeLists.txt b/flightlib/CMakeLists.txt index 213d25d..a3a2b75 100644 --- a/flightlib/CMakeLists.txt +++ b/flightlib/CMakeLists.txt @@ -154,8 +154,7 @@ else() endif() # Summarize Flags -set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FAST_FLAGS} ${CMAKE_CXX_ARCH_FLAGS} ${CMAKE_CXX_PAR_FLAGS}") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FAST_FLAGS} ${CMAKE_CXX_ARCH_FLAGS} ${CMAKE_CXX_PAR_FLAGS}") string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") message(STATUS "The activated CXX RELEASE configuration is:\n ${CMAKE_CXX_FLAGS_RELEASE}") message(STATUS "The activated CXX DEBUG configuration is:\n ${CMAKE_CXX_FLAGS_DEBUG}") @@ -222,7 +221,7 @@ else() ${CUDA_curand_LIBRARY} ${CUDA_cublas_LIBRARY} ${CUDA_LIBRARIES} - ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${PROJECT_SOURCE_DIR} + ${catkin_LIBRARIES} yaml-cpp zmq zmqpp @@ -317,4 +316,4 @@ target_link_libraries(map_visual_node ${catkin_LIBRARIES} ) -message(STATUS "================ !Done. No more nightmare! ================") +message(STATUS "================ !Done. You can build the project now! ================") diff --git a/flightlib/cmake/eigen.cmake b/flightlib/cmake/eigen.cmake index e17cb3e..dd401e8 100644 --- a/flightlib/cmake/eigen.cmake +++ b/flightlib/cmake/eigen.cmake @@ -1,5 +1,6 @@ # Download and unpack eigen at configure time message(STATUS "Getting Eigen...") +message(STATUS "** NOTE ** If there's an issue connecting to GitHub, add a proxy to the download link in file flightlib/cmake/eigen_download.cmake.") configure_file( cmake/eigen_download.cmake diff --git a/flightlib/cmake/gtest.cmake b/flightlib/cmake/gtest.cmake index 98ee7bc..1a78fca 100644 --- a/flightlib/cmake/gtest.cmake +++ b/flightlib/cmake/gtest.cmake @@ -1,5 +1,6 @@ # Download and unpack googletest at configure time message(STATUS "Getting gtests...") +message(STATUS "** NOTE ** If there's an issue connecting to GitHub, add a proxy to the download link in file flightlib/cmake/gtest_download.cmake.") configure_file(cmake/gtest_download.cmake ${PROJECT_SOURCE_DIR}/externals/googletest-download/CMakeLists.txt) execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . diff --git a/flightlib/cmake/pybind11.cmake b/flightlib/cmake/pybind11.cmake index f4c56cd..435d27b 100644 --- a/flightlib/cmake/pybind11.cmake +++ b/flightlib/cmake/pybind11.cmake @@ -1,5 +1,6 @@ # Download and unpack pybind11 at configure time message(STATUS "Getting Pybind11...") +message(STATUS "** NOTE ** If there's an issue connecting to GitHub, add a proxy to the download link in file flightlib/cmake/pybind11_download.cmake.") # set(PYBIND11_PYTHON_VERSION 3.6) set(PYBIND11_PYTHON_VERSION ${PYTHON_VERSION_STRING}) diff --git a/flightlib/cmake/pybind11_download.cmake b/flightlib/cmake/pybind11_download.cmake index d81e578..0744f1e 100644 --- a/flightlib/cmake/pybind11_download.cmake +++ b/flightlib/cmake/pybind11_download.cmake @@ -4,7 +4,7 @@ project(pybind11-download) include(ExternalProject) ExternalProject_Add(pybind11 - GIT_REPOSITORY https://cf.ghproxy.cc/https://github.com/pybind/pybind11 + GIT_REPOSITORY https://github.com/pybind/pybind11 GIT_TAG master SOURCE_DIR "${PROJECT_SOURCE_DIR}/externals/pybind11-src" BINARY_DIR "${PROJECT_SOURCE_DIR}/externals/pybind11-bin" diff --git a/flightlib/cmake/yaml.cmake b/flightlib/cmake/yaml.cmake index 8d1fdea..3785d9c 100644 --- a/flightlib/cmake/yaml.cmake +++ b/flightlib/cmake/yaml.cmake @@ -1,5 +1,6 @@ # Download and unpack eigen at configure time message(STATUS "Getting yaml-cpp...") +message(STATUS "** NOTE ** If there's an issue connecting to GitHub, add a proxy to the download link in file flightlib/cmake/yaml_download.cmake.") configure_file( cmake/yaml_download.cmake diff --git a/flightlib/cmake/yaml_download.cmake b/flightlib/cmake/yaml_download.cmake index 8e75664..793cb13 100644 --- a/flightlib/cmake/yaml_download.cmake +++ b/flightlib/cmake/yaml_download.cmake @@ -4,7 +4,7 @@ project(yaml-download) include(ExternalProject) ExternalProject_Add(yaml - GIT_REPOSITORY https://cf.ghproxy.cc/https://github.com/jbeder/yaml-cpp + GIT_REPOSITORY https://github.com/jbeder/yaml-cpp GIT_TAG master SOURCE_DIR "${PROJECT_SOURCE_DIR}/externals/yaml-src" BINARY_DIR "${PROJECT_SOURCE_DIR}/externals/yaml-bin"