update cmakelists and gitignore

This commit is contained in:
张壹 2021-11-02 10:54:36 +08:00
parent 7954599ae4
commit c005053c93
4 changed files with 31 additions and 28 deletions

1
.gitignore vendored
View File

@ -33,3 +33,4 @@
.DS_Store
build/
*.sh

View File

@ -1,15 +1,15 @@
cmake_minimum_required(VERSION 3.15.2)
#
project(TRIANGLE)
project(TRIANGLE VERSION 1.6)
#
include(CMakePackageConfigHelpers)
message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME})
if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
#set(CMAKE_C_COMPILER gcc)
#set(CMAKE_CXX_COMPILER g++)
set(CMAKE_INSTALL_PREFIX D:/Library)
endif()
# CMake WindowsC:/Program\ Files/${Project_Name} Linux/Unix/usr/local
message(STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX})
# CMake
message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
#
add_subdirectory(src/)

View File

@ -1,17 +0,0 @@
#!/bin/bash
cmd=${1}
package=triangle
address=/opt/stow
targetdir=/usr/local
if [[ ${cmd} == "configure" && ! -d "build/" ]]; then
mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/${package} -DCMAKE_BUILD_TYPE=Release
elif [[ ${cmd} == "configure" ]]; then
cd build && rm -rf * && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/${package} -DCMAKE_BUILD_TYPE=Release
elif [[ ${cmd} == "build" ]]; then
cd build && make
elif [[ ${cmd} == "install" ]]; then
cd build && sudo make install
sudo stow --dir=${address} --target=${targetdir} ${package}
fi

View File

@ -1,7 +1,8 @@
#
aux_source_directory(lib TRILIB_SRC)
#
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
#
@ -21,18 +22,36 @@ set_target_properties(trilib_static PROPERTIES COMPILE_DEFINITIONS "TRILIBRARY")
set_target_properties(trilib PROPERTIES CLEAN_DIRECT_OUTPUT 1)
set_target_properties(trilib_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
#
set_target_properties(trilib PROPERTIES VERSION 1.6 SOVERSION 1.6)
set_target_properties(trilib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
#
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
set(CONFIG_FILE_PATH lib/cmake/${PROJECT_NAME})
configure_package_config_file(${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in
${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake
INSTALL_DESTINATION ${CONFIG_FILE_PATH}
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
write_basic_package_version_file(${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
VERSION ${PROJECT_VERSION}
COMPATIBILITY SameMajorVersion)
#
if(WIN32)
install(TARGETS trilib DESTINATION lib)
install(TARGETS trilib_static DESTINATION lib)
else()
install(TARGETS trilib trilib_static
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
EXPORT ${PROJECT_NAME}Targets
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
install(EXPORT ${PROJECT_NAME}Targets
DESTINATION ${CONFIG_FILE_PATH})
install(FILES
${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake
${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
DESTINATION ${CONFIG_FILE_PATH})
endif()
#
install(FILES lib/triangle.h DESTINATION include)