Skip to content

Commit d8a1ea3

Browse files
committed
Correct INSTALL path for riffa and onidriver_riffa projects
1 parent 2c1e0d2 commit d8a1ea3

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ foreach( src_file IN ITEMS ${SRC_FILES})
6767
source_group("${group_name}" FILES "${src_file}")
6868
endforeach()
6969

70-
7170
function(vs_set_all_configurations target_name target_config_name)
7271
foreach(config ${CMAKE_CONFIGURATION_TYPES})
7372
string(TOUPPER ${config} config_upper)
@@ -78,7 +77,6 @@ function(vs_set_all_configurations target_name target_config_name)
7877
endforeach()
7978
endfunction()
8079

81-
8280
# add liboni project
8381

8482
set(LIBONI_DIR "${CMAKE_CURRENT_SOURCE_DIR}/liboni/api/liboni")
@@ -106,14 +104,15 @@ target_link_libraries(${PLUGIN_NAME} "${LIBONI_NAME}")
106104
set(RIFFA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/liboni/drivers/riffa/windows/lib")
107105
set(RIFFA_NAME riffa)
108106
set(RIFFA_PNAME "submodule_${RIFFA_NAME}")
107+
set(RELEASE_CONFIGURATION "Release")
109108

110109
include_external_msproject (
111110
${RIFFA_PNAME}
112111
"${RIFFA_DIR}/riffa.vcxproj"
113112
PLATFORM ${CMAKE_LIBRARY_ARCHITECTURE}
114113
)
115114

116-
vs_set_all_configurations(${RIFFA_PNAME} "Release")
115+
vs_set_all_configurations(${RIFFA_PNAME} "${RELEASE_CONFIGURATION}")
117116

118117
# add onidriver_riffa project
119118

@@ -127,11 +126,10 @@ include_external_msproject (
127126
PLATFORM ${CMAKE_LIBRARY_ARCHITECTURE}
128127
)
129128

130-
vs_set_all_configurations(${ONIDRIVER_RIFFA_PNAME} "Release")
131-
129+
vs_set_all_configurations(${ONIDRIVER_RIFFA_PNAME} "${RELEASE_CONFIGURATION}")
132130

133131
add_dependencies(${ONIDRIVER_RIFFA_PNAME} ${RIFFA_PNAME})
134132

135133
# Ensure needed DLLs are installed to the shared folder
136134

137-
install(FILES "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/$<CONFIG>/riffa.dll" "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/$<CONFIG>/${ONIDRIVER_RIFFA_NAME}.dll" DESTINATION ${GUI_BIN_DIR}/shared)
135+
install(FILES "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${RELEASE_CONFIGURATION}/riffa.dll" "${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_ARCHITECTURE}/${RELEASE_CONFIGURATION}/${ONIDRIVER_RIFFA_NAME}.dll" DESTINATION ${GUI_BIN_DIR}/shared)

0 commit comments

Comments
 (0)