Skip to content

Commit 37e3484

Browse files
committed
Refactor CMakeLists.txt a bit
This change reformats the CMakeLists.txt a bit to make it visually more compact and renames meshoptimizerConfig.cmake.in to config.cmake.in
1 parent a706d3c commit 37e3484

File tree

2 files changed

+22
-58
lines changed

2 files changed

+22
-58
lines changed

CMakeLists.txt

+22-58
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
2-
project(meshoptimizer VERSION 0.12 LANGUAGES CXX)
1+
cmake_minimum_required(VERSION 3.0)
2+
3+
project(meshoptimizer VERSION 0.12)
34

45
option(BUILD_DEMO "Build demo" OFF)
56
option(BUILD_TOOLS "Build tools" OFF)
@@ -33,26 +34,14 @@ else()
3334
endif()
3435

3536
if(BUILD_SHARED_LIBS)
36-
set_target_properties(
37-
meshoptimizer
38-
PROPERTIES
39-
CXX_VISIBILITY_PRESET hidden
40-
VISIBILITY_INLINES_HIDDEN ON
41-
)
37+
set_target_properties(meshoptimizer PROPERTIES CXX_VISIBILITY_PRESET hidden)
38+
set_target_properties(meshoptimizer PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
39+
4240
if(WIN32)
43-
target_compile_definitions(
44-
meshoptimizer
45-
INTERFACE
46-
"MESHOPTIMIZER_API=__declspec(dllimport)"
47-
PRIVATE
48-
"MESHOPTIMIZER_API=__declspec(dllexport)"
49-
)
41+
target_compile_definitions(meshoptimizer INTERFACE "MESHOPTIMIZER_API=__declspec(dllimport)")
42+
target_compile_definitions(meshoptimizer PRIVATE "MESHOPTIMIZER_API=__declspec(dllexport)")
5043
else()
51-
target_compile_definitions(
52-
meshoptimizer
53-
PUBLIC
54-
"MESHOPTIMIZER_API=__attribute__((visibility(\"default\")))"
55-
)
44+
target_compile_definitions(meshoptimizer PUBLIC "MESHOPTIMIZER_API=__attribute__((visibility(\"default\")))")
5645
endif()
5746
endif()
5847

@@ -68,62 +57,37 @@ if(BUILD_TOOLS)
6857
target_link_libraries(gltfpack meshoptimizer)
6958
list(APPEND TARGETS gltfpack)
7059

60+
# TARGET_PDB_FILE is available since 3.1
7161
if(MSVC AND NOT (CMAKE_VERSION VERSION_LESS "3.1"))
72-
install(
73-
FILES $<TARGET_PDB_FILE:gltfpack>
74-
DESTINATION bin
75-
OPTIONAL
76-
)
62+
install(FILES $<TARGET_PDB_FILE:gltfpack> DESTINATION bin OPTIONAL)
7763
endif()
7864

7965
set_target_properties(gltfpack PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
8066
endif()
8167

82-
install(
83-
TARGETS ${TARGETS}
84-
EXPORT meshoptimizerTargets
68+
install(TARGETS ${TARGETS} EXPORT meshoptimizerTargets
8569
RUNTIME DESTINATION bin
8670
LIBRARY DESTINATION lib
8771
ARCHIVE DESTINATION lib
88-
INCLUDES DESTINATION include
89-
)
72+
INCLUDES DESTINATION include)
9073

91-
install(
92-
FILES src/meshoptimizer.h
93-
DESTINATION include
94-
)
74+
install(FILES src/meshoptimizer.h DESTINATION include)
75+
install(EXPORT meshoptimizerTargets DESTINATION lib/cmake/meshoptimizer NAMESPACE meshoptimizer::)
9576

77+
# TARGET_PDB_FILE is available since 3.1
9678
if(MSVC AND BUILD_SHARED_LIBS AND NOT (CMAKE_VERSION VERSION_LESS "3.1"))
97-
install(
98-
FILES $<TARGET_PDB_FILE:meshoptimizer>
99-
DESTINATION bin
100-
OPTIONAL
101-
)
79+
install(FILES $<TARGET_PDB_FILE:meshoptimizer> DESTINATION bin OPTIONAL)
10280
endif()
10381

104-
install(
105-
EXPORT meshoptimizerTargets
106-
DESTINATION lib/cmake/meshoptimizer
107-
NAMESPACE meshoptimizer::
108-
)
109-
11082
include(CMakePackageConfigHelpers)
11183

112-
configure_package_config_file(
113-
meshoptimizerConfig.cmake.in
84+
configure_package_config_file(config.cmake.in
11485
${CMAKE_CURRENT_BINARY_DIR}/meshoptimizerConfig.cmake
115-
INSTALL_DESTINATION lib/cmake/meshoptimizer
116-
NO_SET_AND_CHECK_MACRO
117-
)
86+
INSTALL_DESTINATION lib/cmake/meshoptimizer NO_SET_AND_CHECK_MACRO)
11887

119-
write_basic_package_version_file(
120-
${CMAKE_CURRENT_BINARY_DIR}/meshoptimizerConfigVersion.cmake
121-
COMPATIBILITY ExactVersion
122-
)
88+
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/meshoptimizerConfigVersion.cmake COMPATIBILITY ExactVersion)
12389

124-
install(
125-
FILES
90+
install(FILES
12691
${CMAKE_CURRENT_BINARY_DIR}/meshoptimizerConfig.cmake
12792
${CMAKE_CURRENT_BINARY_DIR}/meshoptimizerConfigVersion.cmake
128-
DESTINATION lib/cmake/meshoptimizer
129-
)
93+
DESTINATION lib/cmake/meshoptimizer)
File renamed without changes.

0 commit comments

Comments
 (0)