diff --git a/CMakeLists.txt b/CMakeLists.txt index 113f903..ed65807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.0) project(ReducedModelOptimization) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -15,7 +15,6 @@ else() set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1") endif() - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "RelWithDebInfo") set(EXTERNAL_DEPS_DIR "C:/Users/iason/Downloads/ReducedModelOptimization/build/externalDependencies/") @@ -28,11 +27,14 @@ file(MAKE_DIRECTORY ${EXTERNAL_DEPS_DIR}) if(${CMAKE_BUILD_TYPE} STREQUAL "Release") set(USE_POLYSCOPE FALSE) + set(MYSOURCES_STATIC_LINK TRUE) else() add_compile_definitions(POLYSCOPE_DEFINED) set(USE_POLYSCOPE TRUE) + add_compile_definitions(POLYSCOPE_DEFINED) + set(MYSOURCES_STATIC_LINK FALSE) endif() -set(MYSOURCES_STATIC_LINK FALSE) + set(MYSOURCES_SOURCE_DIR "/home/iason/Coding/Libraries/MySources") if (EXISTS ${MYSOURCES_SOURCE_DIR}) @@ -47,20 +49,6 @@ download_project(PROJ MYSOURCES endif() add_subdirectory(${MYSOURCES_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/MySourcesBinDir) -##Polyscope -if(${USE_POLYSCOPE}) -download_project(PROJ POLYSCOPE - GIT_REPOSITORY https://github.com/nmwsharp/polyscope.git - GIT_TAG master - PREFIX ${EXTERNAL_DEPS_DIR} - ${UPDATE_DISCONNECTED_IF_AVAILABLE} -) -if(NOT EXISTS ${POLYSCOPE_BINARY_DIR}) -add_subdirectory(${POLYSCOPE_SOURCE_DIR} ${POLYSCOPE_BINARY_DIR}) -endif() -add_compile_definitions(POLYSCOPE_DEFINED) -endif() - #dlib set(DLIB_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/dlib_bin) file(MAKE_DIRECTORY ${DLIB_BIN_DIR}) @@ -73,20 +61,9 @@ download_project(PROJ DLIB ) add_subdirectory(${DLIB_SOURCE_DIR} ${DLIB_BINARY_DIR}) -##vcglib devel branch -download_project(PROJ vcglib_devel - GIT_REPOSITORY https://github.com/IasonManolas/vcglib.git - GIT_TAG devel - PREFIX ${EXTERNAL_DEPS_DIR} - ${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) -#find_package(OpenMP REQUIRED) - #Add the project sources file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) @@ -94,24 +71,14 @@ if(MSVC) add_compile_definitions(_HAS_STD_BYTE=0) endif(MSVC) -add_executable(${PROJECT_NAME} ${SOURCES} ${EXT_SOURCES}) +add_executable(${PROJECT_NAME} ${SOURCES}) + target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20) - target_include_directories(${PROJECT_NAME} - PUBLIC ${vcglib_devel_SOURCE_DIR} PUBLIC ${MYSOURCES_SOURCE_DIR} - PUBLIC ${MYSOURCES_SOURCE_DIR}/boost_graph ) - - -target_link_directories(${PROJECT_NAME} PRIVATE ${MYSOURCES_SOURCE_DIR}/boost_graph/libs/) if(${MYSOURCES_STATIC_LINK}) - message("Linking statically") target_link_libraries(${PROJECT_NAME} -static Eigen3::Eigen dlib::dlib MySources) else() - if(${USE_POLYSCOPE}) - message("Using polyscope") - target_link_libraries(${PROJECT_NAME} polyscope) - endif() target_link_libraries(${PROJECT_NAME} Eigen3::Eigen dlib::dlib MySources) endif()