drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox] Get rid of ox subdirectory in lib install path

Browse Source
This commit is contained in:
Gary Talent 2023-04-19 20:45:18 -05:00
parent fddc6c2d04
commit 546ce9b253
12 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/ox/CMakeLists.txt vendored
View File

@ -76,7 +76,7 @@ enable_testing()
include_directories(src) include_directories(src)
install(FILES OxConfig.cmake DESTINATION lib/ox) install(FILES OxConfig.cmake DESTINATION lib/cmake/ox)
if(OX_USE_STDLIB) if(OX_USE_STDLIB)
set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include") set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include")

25
deps/ox/OxConfig.cmake vendored
View File

@ -1,15 +1,16 @@
if("${CMAKE_FIND_ROOT_PATH}" STREQUAL "") if("${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
set(Ox_INCLUDE_DIRS /usr/local/include/) set(OX_PATH /usr/local/include/)
set(OxStd_LIBRARY /usr/local/lib/ox/libOxStd.a)
set(OxFS_LIBRARY /usr/local/lib/ox/libOxFS.a)
set(OxClArgs_LIBRARY /usr/local/lib/ox/libOxClArgs.a)
set(OxMetalClaw_LIBRARY /usr/local/lib/ox/libOxMetalClaw.a)
set(OxModel_LIBRARY /usr/local/lib/ox/libOxModelClaw.a)
else("${CMAKE_FIND_ROOT_PATH}" STREQUAL "") else("${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
set(Ox_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/include/) set(OX_PATH ${CMAKE_FIND_ROOT_PATH})
set(OxStd_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxStd.a)
set(OxFS_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxFS.a)
set(OxClArgs_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxClArgs.a)
set(OxMetalClaw_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxMetalClaw.a)
set(OxModel_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxModel.a)
endif("${CMAKE_FIND_ROOT_PATH}" STREQUAL "") endif("${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
set(OxClArgs_LIBRARY ${OX_PATH}/lib/ox/libOxClArgs.a)
set(OxEvent_LIBRARY ${OX_PATH}/lib/ox/libOxEvent.a)
set(OxFS_LIBRARY ${OX_PATH}/lib/ox/libOxFS.a)
set(OxLogConn_LIBRARY ${OX_PATH}/lib/ox/libOxLogConn.a)
set(OxMetalClaw_LIBRARY ${OX_PATH}/lib/ox/libOxMetalClaw.a)
set(OxModel_LIBRARY ${OX_PATH}/lib/ox/libOxModel.a)
set(OxOrganicClaw_LIBRARY ${OX_PATH}/lib/ox/libOxOrganicClaw.a)
set(OxPreloader_LIBRARY ${OX_PATH}/lib/ox/libOxPreloader.a)
set(OxStd_LIBRARY ${OX_PATH}/lib/ox/libOxStd.a)
set(Ox_INCLUDE_DIRS ${OX_PATH}/include/)

4
deps/ox/src/ox/clargs/CMakeLists.txt vendored
View File

@ -27,6 +27,6 @@ install(
install( install(
TARGETS TARGETS
OxClArgs OxClArgs
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )

5
deps/ox/src/ox/claw/CMakeLists.txt vendored
View File

@ -12,6 +12,11 @@ target_link_libraries(
$<$<BOOL:${OX_USE_STDLIB}>:OxOrganicClaw> $<$<BOOL:${OX_USE_STDLIB}>:OxOrganicClaw>
) )
install(TARGETS OxClaw
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS) if(OX_RUN_TESTS)
add_subdirectory(test) add_subdirectory(test)
endif() endif()

4
deps/ox/src/ox/event/CMakeLists.txt vendored
View File

@ -36,8 +36,8 @@ install(
) )
install(TARGETS OxEvent install(TARGETS OxEvent
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )
if(OX_RUN_TESTS) if(OX_RUN_TESTS)

4
deps/ox/src/ox/fs/CMakeLists.txt vendored
View File

@ -75,8 +75,8 @@ install(
install( install(
TARGETS TARGETS
OxFS OxFS
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )
if(OX_RUN_TESTS) if(OX_RUN_TESTS)

4
deps/ox/src/ox/logconn/CMakeLists.txt vendored
View File

@ -29,6 +29,6 @@ install(
install( install(
TARGETS TARGETS
OxLogConn OxLogConn
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )

4
deps/ox/src/ox/mc/CMakeLists.txt vendored
View File

@ -38,8 +38,8 @@ install(
) )
install(TARGETS OxMetalClaw install(TARGETS OxMetalClaw
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )
if(OX_RUN_TESTS) if(OX_RUN_TESTS)

4
deps/ox/src/ox/model/CMakeLists.txt vendored
View File

@ -40,8 +40,8 @@ install(
) )
install(TARGETS OxModel install(TARGETS OxModel
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )
if(OX_RUN_TESTS) if(OX_RUN_TESTS)

4
deps/ox/src/ox/oc/CMakeLists.txt vendored
View File

@ -36,8 +36,8 @@ install(
) )
install(TARGETS OxOrganicClaw install(TARGETS OxOrganicClaw
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )
if(OX_RUN_TESTS) if(OX_RUN_TESTS)

9
deps/ox/src/ox/preloader/CMakeLists.txt vendored
View File

@ -1,6 +1,6 @@
add_library( add_library(
OxPreloader OxPreloader STATIC
preloader.cpp preloader.cpp
) )
@ -20,3 +20,10 @@ install(
DESTINATION DESTINATION
include/nostalgia/preloader include/nostalgia/preloader
) )
install(
TARGETS
OxPreloader
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

4
deps/ox/src/ox/std/CMakeLists.txt vendored
View File

@ -119,8 +119,8 @@ install(
) )
install(TARGETS OxStd OxTraceHook install(TARGETS OxStd OxTraceHook
LIBRARY DESTINATION lib/ox LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/ox ARCHIVE DESTINATION lib
) )
if(OX_RUN_TESTS) if(OX_RUN_TESTS)