Skip to content

Commit 8c8f1c9

Browse files
committed
update
1 parent 2098630 commit 8c8f1c9

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
3131
include(CMakePackageConfigHelpers)
3232
include(GNUInstallDirs)
3333

34-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
34+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
3535

3636

3737
# ==============================================================================
@@ -97,26 +97,26 @@ endif ()
9797
# ==============================================================================
9898

9999
configure_package_config_file(cmake/config.cmake.in
100-
${CMAKE_CURRENT_BINARY_DIR}/threepp-config.cmake
101-
INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/threepp
100+
"${CMAKE_CURRENT_BINARY_DIR}/threepp-config.cmake"
101+
INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/threepp"
102102
PATH_VARS THREEPP_USE_EXTERNAL_GLFW
103103
NO_SET_AND_CHECK_MACRO)
104104
write_basic_package_version_file(
105-
${CMAKE_CURRENT_BINARY_DIR}/threepp-config-version.cmake
105+
"${CMAKE_CURRENT_BINARY_DIR}/threepp-config-version.cmake"
106106
VERSION ${CMAKE_PROJECT_VERSION}
107107
COMPATIBILITY SameMajorVersion)
108108
install(
109109
FILES
110-
${CMAKE_CURRENT_BINARY_DIR}/threepp-config.cmake
111-
${CMAKE_CURRENT_BINARY_DIR}/threepp-config-version.cmake
110+
"${CMAKE_CURRENT_BINARY_DIR}/threepp-config.cmake"
111+
"${CMAKE_CURRENT_BINARY_DIR}/threepp-config-version.cmake"
112112
DESTINATION
113-
${CMAKE_INSTALL_DATADIR}/threepp)
113+
"${CMAKE_INSTALL_DATADIR}/threepp")
114114

115115
if (BUILD_SHARED_LIBS AND NOT THREEPP_USE_EXTERNAL_GLFW)
116116
install(TARGETS glfw EXPORT threepp-targets)
117117
endif ()
118118
install(TARGETS threepp EXPORT threepp-targets)
119-
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
119+
install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
120120
install(EXPORT threepp-targets
121121
NAMESPACE threepp::
122-
DESTINATION ${CMAKE_INSTALL_DATADIR}/threepp)
122+
DESTINATION "${CMAKE_INSTALL_DATADIR}/threepp")

examples/libs/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ add_library(optimization INTERFACE
2222
)
2323
target_include_directories(optimization INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
2424

25-
add_library(bvh
25+
add_library(bvh OBJECT
2626
bvh/BVH.hpp
2727
bvh/BVH.cpp
2828
)
2929
target_link_libraries(bvh PUBLIC threepp)
3030
target_include_directories(bvh PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
31+
set_target_properties(bvh PROPERTIES POSITION_INDEPENDENT_CODE ON)

0 commit comments

Comments
 (0)