diff --git a/CMakeLists.txt b/CMakeLists.txt index dcb4f0b..118d6bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,14 +15,6 @@ endif() ##Create directory for the external libraries file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build/external) -##vcglib devel branch -download_project(PROJ vcglib_devel - GIT_REPOSITORY https://github.com/cnr-isti-vclab/vcglib.git - GIT_TAG devel - PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ - ${UPDATE_DISCONNECTED_IF_AVAILABLE} -) - ##matplot++ lib download_project(PROJ MATPLOTPLUSPLUS GIT_REPOSITORY https://github.com/alandefreitas/matplotplusplus @@ -48,25 +40,30 @@ download_project(PROJ BOBYQA PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) +add_compile_definitions(BOBYQA_DEBUG) add_subdirectory(${BOBYQA_SOURCE_DIR}) message(STATUS "BOBYQA bin dir:${BOBYQA_BINARY_DIR}") +##vcglib devel branch +download_project(PROJ vcglib_devel + GIT_REPOSITORY https://github.com/cnr-isti-vclab/vcglib.git + GIT_TAG devel + PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/external/ + ${UPDATE_DISCONNECTED_IF_AVAILABLE} +) +file(GLOB EXT_SOURCES ${vcglib_devel_SOURCE_DIR}/wrap/ply/plylib.cpp) + ##Eigen 3 NOTE: Eigen is required on the system the code is ran find_package(Eigen3 3.3 REQUIRED) -#Add the project sources -file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) - #OpenMP -find_package(OpenMP) +find_package(OpenMP REQUIRED) set(MYSOURCESDIR "/home/iason/Coding/Libraries/MySources") -file(GLOB MYSOURCES ${MYSOURCESDIR}/*.hpp ${MYSOURCESDIR}/*.cpp) - -file(GLOB EXT_SOURCES ${vcglib_devel_SOURCE_DIR}/wrap/ply/plylib.cpp +file(GLOB MYSOURCES ${MYSOURCESDIR}/*.hpp ${MYSOURCESDIR}/*.cpp ) - - +#Add the project sources +file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) add_executable(${PROJECT_NAME} ${SOURCES} ${MYSOURCES} ${EXT_SOURCES} ) target_include_directories(${PROJECT_NAME}