Skip to content

Commit 7257735

Browse files
jhericojherico
committed
Fix cached cmake variables
1 parent 6a78dd3 commit 7257735

File tree

7 files changed

+16
-17
lines changed

7 files changed

+16
-17
lines changed

‎cmake/externals/LibOVR/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ if (WIN32)
2929

3030
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
3131
ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
32-
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/Include CACHE TYPE INTERNAL)
33-
set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/Lib/LibOVRd.lib CACHE TYPE INTERNAL)
34-
set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/Lib/LibOVR.lib CACHE TYPE INTERNAL)
32+
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/Include CACHE INTERNAL "${EXTERNAL_NAME} include directories")
33+
set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/Lib/LibOVRd.lib CACHE INTERNAL "${EXTERNAL_NAME} debug libs")
34+
set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/Lib/LibOVR.lib CACHE INTERNAL "${EXTERNAL_NAME} release libs")
3535
include(SelectLibraryConfigurations)
3636
select_library_configurations(LIBOVR)
37-
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE TYPE INTERNAL)
37+
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE INTERNAL "${EXTERNAL_NAME} combined libs")
3838

3939
elseif(APPLE)
4040

‎cmake/externals/assimp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ add_custom_command(
4949

5050
include(SelectLibraryConfigurations)
5151
select_library_configurations(${EXTERNAL_NAME_UPPER})
52-
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE TYPE INTERNAL)
52+
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE INTERNAL "")
5353

‎cmake/externals/glfw3/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ ExternalProject_Add(
1111
)
1212

1313
ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
14-
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include CACHE TYPE INTERNAL)
15-
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE INTERNAL)
14+
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include CACHE INTERNAL "")
15+
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE INTERNAL "")
1616
#set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/glfw3dll.lib CACHE FILEPATH "Path to glfw debug library")
17-
set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/glfw3dll.lib CACHE FILEPATH "Path to glfw release library")
17+
set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/glfw3dll.lib CACHE INTERNAL "")
1818
include(SelectLibraryConfigurations)
1919
select_library_configurations(${EXTERNAL_NAME_UPPER})
20-
set(${EXTERNAL_NAME_UPPER}_LIBRARY ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE TYPE INTERNAL)
20+
set(${EXTERNAL_NAME_UPPER}_LIBRARY ${${EXTERNAL_NAME_UPPER}_LIBRARY} CACHE INTERNAL "")
2121
# copy the DLL
2222
add_custom_command(TARGET ${EXTERNAL_NAME} POST_BUILD
2323
COMMAND ${CMAKE_COMMAND} -E copy ${INSTALL_DIR}/lib/glfw3.dll ${CMAKE_SOURCE_DIR}/bin)

‎cmake/externals/gli/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ ExternalProject_Add(
1515
set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "externals")
1616

1717
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
18-
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
18+
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE INTERNAL "")
1919

‎cmake/externals/glm/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ExternalProject_Add(
1515
set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "externals")
1616

1717
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
18-
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
18+
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE INTERNAL "")

‎cmake/externals/openvr/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "externals")
1919

2020
ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
2121

22-
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/headers CACHE TYPE INTERNAL)
22+
set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/headers CACHE INTERNAL "")
2323

2424
if (WIN32)
2525

2626
# FIXME need to account for different architectures
2727
if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
28-
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/win64/openvr_api.lib CACHE TYPE INTERNAL)
28+
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/win64/openvr_api.lib CACHE INTERNAL "")
2929
add_custom_command(TARGET ${EXTERNAL_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Release> ${CMAKE_COMMAND} -E copy ${SOURCE_DIR}/bin/win64/openvr_api.dll ${CMAKE_SOURCE_DIR}/bin )
3030
add_custom_command(TARGET ${EXTERNAL_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Debug> ${CMAKE_COMMAND} -E copy ${SOURCE_DIR}/bin/win64/openvr_api.dll ${CMAKE_SOURCE_DIR}/bin_debug )
3131
else()
32-
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/win32/openvr_api.lib CACHE TYPE INTERNAL)
32+
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/win32/openvr_api.lib CACHE INTERNAL "")
3333
add_paths_to_fixup_libs(${SOURCE_DIR}/bin/win32)
3434
add_custom_command(TARGET ${EXTERNAL_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Release> ${CMAKE_COMMAND} -E copy ${SOURCE_DIR}/bin/win32/openvr_api.dll ${CMAKE_SOURCE_DIR}/bin )
3535
add_custom_command(TARGET ${EXTERNAL_NAME} POST_BUILD COMMAND if 1==$<CONFIG:Debug> ${CMAKE_COMMAND} -E copy ${SOURCE_DIR}/bin/win32/openvr_api.dll ${CMAKE_SOURCE_DIR}/bin_debug )
@@ -39,13 +39,13 @@ if (WIN32)
3939
elseif(APPLE)
4040

4141
# FIXME need to account for different architectures
42-
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/osx32/libopenvr_api.dylib CACHE TYPE INTERNAL)
42+
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/osx32/libopenvr_api.dylib CACHE INTERNAL "")
4343
add_paths_to_fixup_libs(${SOURCE_DIR}/bin/osx32)
4444

4545
elseif(NOT ANDROID)
4646

4747
# FIXME need to account for different architectures
48-
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux64/libopenvr_api.so CACHE TYPE INTERNAL)
48+
set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux64/libopenvr_api.so CACHE INTERNAL "")
4949
add_paths_to_fixup_libs(${SOURCE_DIR}/bin/linux64)
5050

5151
endif()

‎cmake/macros/TargetGLFW3.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ macro(TARGET_GLFW3)
1515
endif()
1616
target_include_directories(${TARGET_NAME} PUBLIC ${GLFW3_INCLUDE_DIR})
1717
target_link_libraries(${TARGET_NAME} ${GLFW3_LIBRARY})
18-
message("GLFW3_LIBRARY ${GLFW3_LIBRARY} GLFW3_LIBRARIES ${GLFW3_LIBRARIES} ")
1918
endmacro()

0 commit comments

Comments
 (0)