12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reformat CMake files

release/4.3a0
Fan Jiang 2020-08-18 11:47:38 -04:00
parent cbddcd0f51
commit 3d846ef7a8
2 changed files with 202 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -137,7 +137,7 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))) (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)))
# Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support. # Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support.
# Rationale in https://github.com/ninja-build/ninja/issues/814 # Rationale in https://github.com/ninja-build/ninja/issues/814
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") add_compile_options(-fdiagnostics-color=always)
endif() endif()
############################################################################### ###############################################################################

6
python/CMakeLists.txt
View File

@ -1,6 +1,9 @@
set(GTSAM_PYTHON_BUILD_DIRECTORY ${PROJECT_BINARY_DIR}/python) set(GTSAM_PYTHON_BUILD_DIRECTORY ${PROJECT_BINARY_DIR}/python)
if(GTSAM_BUILD_PYTHON) if (NOT GTSAM_BUILD_PYTHON)
return()
endif()
# Generate setup.py. # Generate setup.py.
file(READ "${PROJECT_SOURCE_DIR}/README.md" README_CONTENTS) file(READ "${PROJECT_SOURCE_DIR}/README.md" README_CONTENTS)
configure_file(${PROJECT_SOURCE_DIR}/python/setup.py.in configure_file(${PROJECT_SOURCE_DIR}/python/setup.py.in
@ -101,4 +104,3 @@ if(GTSAM_BUILD_PYTHON)
add_custom_target(${GTSAM_PYTHON_INSTALL_TARGET} add_custom_target(${GTSAM_PYTHON_INSTALL_TARGET}
COMMAND ${PYTHON_EXECUTABLE} ${GTSAM_PYTHON_BUILD_DIRECTORY}/setup.py install COMMAND ${PYTHON_EXECUTABLE} ${GTSAM_PYTHON_BUILD_DIRECTORY}/setup.py install
WORKING_DIRECTORY ${GTSAM_PYTHON_BUILD_DIRECTORY}) WORKING_DIRECTORY ${GTSAM_PYTHON_BUILD_DIRECTORY})
endif()