drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

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

Browse Source 
(synced from 546ce9b253)
This commit is contained in:
Gary Talent
2023-04-19 20:45:18 -05:00
parent e77533b50c
commit c4f4a9b449
12 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/clargs/CMakeLists.txt
+2 -2
View File
@@ -27,6 +27,6 @@ install(
install(
TARGETS
OxClArgs
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
src/ox/claw/CMakeLists.txt
+6 -1
View File
@@ -12,6 +12,11 @@ target_link_libraries(
$<$<BOOL:${OX_USE_STDLIB}>:OxOrganicClaw>
)
install(TARGETS OxClaw
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS)
add_subdirectory(test)
endif()
endif()
src/ox/event/CMakeLists.txt
+3 -3
View File
@@ -36,10 +36,10 @@ install(
)
install(TARGETS OxEvent
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS)
add_subdirectory(test)
endif()
endif()
src/ox/fs/CMakeLists.txt
+2 -2
View File
@@ -75,8 +75,8 @@ install(
install(
TARGETS
OxFS
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS)
src/ox/logconn/CMakeLists.txt
+2 -2
View File
@@ -29,6 +29,6 @@ install(
install(
TARGETS
OxLogConn
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
src/ox/mc/CMakeLists.txt
+2 -2
View File
@@ -38,8 +38,8 @@ install(
)
install(TARGETS OxMetalClaw
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS)
src/ox/model/CMakeLists.txt
+2 -2
View File
@@ -40,8 +40,8 @@ install(
)
install(TARGETS OxModel
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS)
src/ox/oc/CMakeLists.txt
+2 -2
View File
@@ -36,8 +36,8 @@ install(
)
install(TARGETS OxOrganicClaw
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS)
src/ox/preloader/CMakeLists.txt
+8 -1
View File
@@ -1,6 +1,6 @@
add_library(
OxPreloader
OxPreloader STATIC
preloader.cpp
)
@@ -20,3 +20,10 @@ install(
DESTINATION
include/nostalgia/preloader
)
install(
TARGETS
OxPreloader
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
src/ox/std/CMakeLists.txt
+2 -2
View File
@@ -119,8 +119,8 @@ install(
)
install(TARGETS OxStd OxTraceHook
LIBRARY DESTINATION lib/ox
ARCHIVE DESTINATION lib/ox
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(OX_RUN_TESTS)