manolas
/
threed-beam-fea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved code of src/CMakeLists.txt to CMakeLists.txt . Using target_include_directories instead of include_directories

This commit is contained in:
iasonmanolas 2021-03-15 18:46:16 +02:00
parent 14532af0da
commit 390f45a58a
2 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
CMakeLists.txt
View File

@ -6,44 +6,29 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")
endif() endif()
option(FEA_BUILD_UNIT_TESTS "Build unit tests" OFF)
option(FEA_BUILD_EXAMPLES "Build examples" OFF)
option(FEA_BUILD_GUI "Build Qt GUI" OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
include(FindOpenMP) #include(FindOpenMP)
if(OPENMP_FOUND) #if(OPENMP_FOUND)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -fopenmp") # set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -fopenmp")
endif(OPENMP_FOUND) #endif(OPENMP_FOUND)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
set(EXT_BOOST_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/boost-1.65.1) set(EXT_BOOST_ROOT ${CMAKE_CURRENT_LIST_DIR}/ext/boost-1.65.1)
set(EXT_EIGEN_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/eigen-3.3.4) set(EXT_EIGEN_ROOT ${CMAKE_CURRENT_LIST_DIR}/ext/eigen-3.3.4)
set(EXT_RAPIDJSON_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/rapidjson-1.1.0/include) set(EXT_RAPIDJSON_ROOT ${CMAKE_CURRENT_LIST_DIR}/ext/rapidjson-1.1.0/include)
set(EXT_TCLAP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/tclap-1.2.1/include) set(EXT_TCLAP_ROOT ${CMAKE_CURRENT_LIST_DIR}/ext/tclap-1.2.1/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include #include_directories(${EXT_BOOST_ROOT})
${EXT_EIGEN_ROOT} add_library(${PROJECT_NAME} src/cmd.cpp src/setup.cpp src/summary.cpp src/threed_beam_fea.cpp)
${EXT_BOOST_ROOT}
${EXT_RAPIDJSON_ROOT} target_include_directories(${PROJECT_NAME}
${EXT_TCLAP_ROOT} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include/
PUBLIC ${EXT_BOOST_ROOT}
PRIVATE ${EXT_EIGEN_ROOT}
PRIVATE ${EXT_RAPIDJSON_ROOT}
PRIVATE ${EXT_TCLAP_ROOT}
) )
add_subdirectory(src)
if (FEA_BUILD_EXAMPLES)
add_subdirectory(examples)
endif(FEA_BUILD_EXAMPLES)
if(FEA_BUILD_UNIT_TESTS)
enable_testing()
add_subdirectory(tests)
endif(FEA_BUILD_UNIT_TESTS)
if(FEA_BUILD_GUI)
add_subdirectory(gui)
endif(FEA_BUILD_GUI)

1
src/CMakeLists.txt
View File

@ -1 +0,0 @@
add_library(threed_beam_fea threed_beam_fea.cpp summary.cpp setup.cpp)