Permalink
Browse files
CMake: Fix bin dir being explictly named in several places
- Loading branch information...
Showing
with
3 additions
and
3 deletions.
-
+2
−2
CMakeLists.txt
-
+1
−1
src/platform/sdl/CMakeLists.txt
|
|
@@ -897,7 +897,7 @@ if(BUILD_PERF) |
|
|
add_executable(${BINARY_NAME}-perf ${PERF_SRC})
|
|
|
target_link_libraries(${BINARY_NAME}-perf ${BINARY_NAME} ${PERF_LIB} ${OS_LIB})
|
|
|
set_target_properties(${BINARY_NAME}-perf PROPERTIES COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}")
|
|
|
- install(TARGETS ${BINARY_NAME}-perf DESTINATION bin COMPONENT ${BINARY_NAME}-perf)
|
|
|
+ install(TARGETS ${BINARY_NAME}-perf DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${BINARY_NAME}-perf)
|
|
|
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tools/perf.py DESTINATION "${LIBDIR}/${BINARY_NAME}" COMPONENT ${BINARY_NAME}-perf)
|
|
|
endif()
|
|
|
|
|
|
@@ -908,7 +908,7 @@ if(BUILD_TEST) |
|
|
add_executable(tbl-fuzz ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/test/tbl-fuzz-main.c)
|
|
|
target_link_libraries(tbl-fuzz ${BINARY_NAME})
|
|
|
set_target_properties(tbl-fuzz PROPERTIES COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}")
|
|
|
- install(TARGETS ${BINARY_NAME}-fuzz tbl-fuzz DESTINATION bin COMPONENT ${BINARY_NAME}-test)
|
|
|
+ install(TARGETS ${BINARY_NAME}-fuzz tbl-fuzz DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${BINARY_NAME}-test)
|
|
|
endif()
|
|
|
|
|
|
if(NOT USE_CMOCKA)
|
|
|
|
|
|
@@ -64,7 +64,7 @@ if(BUILD_RASPI) |
|
|
add_executable(${BINARY_NAME}-rpi ${PLATFORM_SRC} ${MAIN_SRC})
|
|
|
set_target_properties(${BINARY_NAME}-rpi PROPERTIES COMPILE_DEFINITIONS "${FEATURE_DEFINES};${FUNCTION_DEFINES}")
|
|
|
target_link_libraries(${BINARY_NAME}-rpi ${BINARY_NAME} ${PLATFORM_LIBRARY} ${OPENGLES2_LIBRARY})
|
|
|
- install(TARGETS ${BINARY_NAME}-rpi DESTINATION bin COMPONENT ${BINARY_NAME}-rpi)
|
|
|
+ install(TARGETS ${BINARY_NAME}-rpi DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${BINARY_NAME}-rpi)
|
|
|
unset(OPENGLES2_INCLUDE_DIR} CACHE) # Clear NOTFOUND
|
|
|
endif()
|
|
|
|
|
|
|
0 comments on commit
42035bc