Skip to content

Commit 9d259c6

Browse files
committed
f/sawhite-cmake - Install logic was failing to export all targets due to casing issue
1 parent 9d94413 commit 9d259c6

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

projects/biogears/CMakeLists.txt

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ else()
183183
message(STATUS "${PREFIX}_cdm_LIBS=${${PREFIX}_cdm_LIBS}")
184184
target_link_libraries(lib${PROJECT_NAME}_cdm PUBLIC ${${PREFIX}_cdm_LIBS} )
185185

186-
install(TARGETS lib${PROJECT_NAME}_cdm EXPORT lib${PROJECT_NAME}
186+
install(TARGETS lib${PROJECT_NAME}_cdm EXPORT libBiogears
187187
RUNTIME DESTINATION bin/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
188188
LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
189189
ARCHIVE DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
190-
)
191-
if(WIN32)
192-
install(FILES $<TARGET_PDB_FILE:lib${PROJECT_NAME}_cdm> DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>> OPTIONAL)
193-
endif()
190+
)
191+
if(WIN32)
192+
install(FILES $<TARGET_PDB_FILE:lib${PROJECT_NAME}_cdm> DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>> OPTIONAL)
193+
endif()
194194
###############################################################################
195195
# libBiogears
196196
###############################################################################
@@ -243,14 +243,14 @@ else()
243243
)
244244
message(STATUS "${PREFIX}_LIBS=${${PREFIX}_LIBS}")
245245
target_link_libraries(lib${PROJECT_NAME} PUBLIC ${${PREFIX}_LIBS} )
246-
install(TARGETS lib${PROJECT_NAME} EXPORT lib${PROJECT_NAME}
247-
RUNTIME DESTINATION bin/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
248-
LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
249-
ARCHIVE DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
250-
)
251-
if(WIN32)
246+
#install(TARGETS lib${PROJECT_NAME} EXPORT libBiogears
247+
# RUNTIME DESTINATION bin/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
248+
# LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
249+
# ARCHIVE DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
250+
#)
251+
if(WIN32)
252252
install(FILES $<TARGET_PDB_FILE:lib${PROJECT_NAME}> DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>> OPTIONAL)
253-
endif()
253+
endif()
254254
###############################################################################
255255
# libBiogears_circuit_test
256256
###############################################################################
@@ -293,7 +293,7 @@ else()
293293
target_link_libraries(lib${PROJECT_NAME}_circuit_test PUBLIC ${${PREFIX}_CIRCUIT_TEST_LIBS} )
294294

295295

296-
install(TARGETS lib${PROJECT_NAME}_circuit_test EXPORT lib${PROJECT_NAME}
296+
install(TARGETS lib${PROJECT_NAME}_circuit_test EXPORT libBiogears
297297
RUNTIME DESTINATION bin/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
298298
LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
299299
ARCHIVE DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
@@ -344,7 +344,7 @@ else()
344344
target_link_libraries(lib${PROJECT_NAME}_jni PUBLIC ${${PREFIX}_jni_LIBS} )
345345

346346

347-
install(TARGETS lib${PROJECT_NAME}_jni EXPORT lib${PROJECT_NAME}
347+
install(TARGETS lib${PROJECT_NAME}_jni EXPORT libBiogears
348348
RUNTIME DESTINATION bin/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
349349
LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
350350
ARCHIVE DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
@@ -358,16 +358,14 @@ endif() #${PREFIX}_BUILD_STATIC
358358
######################################################################################################
359359
# INSTALL LOGIC
360360
######################################################################################################
361-
install(TARGETS lib${PROJECT_NAME} EXPORT lib${PROJECT_NAME}
361+
install(TARGETS lib${PROJECT_NAME} EXPORT libBiogears
362362
RUNTIME DESTINATION bin/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
363363
LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
364364
ARCHIVE DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>>
365-
)
366-
if(WIN32)
365+
)
366+
if(WIN32)
367367
install(FILES $<TARGET_PDB_FILE:lib${PROJECT_NAME}> DESTINATION lib/${${ROOT_PROJECT_NAME}_PLATFORM_PREFIX}$<$<BOOL:${${ROOT_PROJECT_NAME}_BREAKOUT_INSTALL}>:/$<CONFIG>> OPTIONAL)
368-
endif()
369-
370-
368+
endif()
371369

372370
install(DIRECTORY
373371
libBiogears/include/biogears

0 commit comments

Comments
 (0)