diff --git a/deps/ox/CMakeLists.txt b/deps/ox/CMakeLists.txt index 2d0a2ae2..c2de42f1 100644 --- a/deps/ox/CMakeLists.txt +++ b/deps/ox/CMakeLists.txt @@ -76,7 +76,7 @@ enable_testing() include_directories(src) -install(FILES OxConfig.cmake DESTINATION lib/ox) +install(FILES OxConfig.cmake DESTINATION lib/cmake/ox) if(OX_USE_STDLIB) set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include") diff --git a/deps/ox/OxConfig.cmake b/deps/ox/OxConfig.cmake index c442c206..45a0cdcc 100644 --- a/deps/ox/OxConfig.cmake +++ b/deps/ox/OxConfig.cmake @@ -1,15 +1,16 @@ if("${CMAKE_FIND_ROOT_PATH}" STREQUAL "") - set(Ox_INCLUDE_DIRS /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) + set(OX_PATH /usr/local/include/) else("${CMAKE_FIND_ROOT_PATH}" STREQUAL "") - set(Ox_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/include/) - 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) + set(OX_PATH ${CMAKE_FIND_ROOT_PATH}) 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/) diff --git a/deps/ox/src/ox/clargs/CMakeLists.txt b/deps/ox/src/ox/clargs/CMakeLists.txt index e05fca43..a8c4d66f 100644 --- a/deps/ox/src/ox/clargs/CMakeLists.txt +++ b/deps/ox/src/ox/clargs/CMakeLists.txt @@ -27,6 +27,6 @@ install( install( TARGETS OxClArgs - LIBRARY DESTINATION lib/ox - ARCHIVE DESTINATION lib/ox + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) diff --git a/deps/ox/src/ox/claw/CMakeLists.txt b/deps/ox/src/ox/claw/CMakeLists.txt index a4a00479..8d6c261b 100644 --- a/deps/ox/src/ox/claw/CMakeLists.txt +++ b/deps/ox/src/ox/claw/CMakeLists.txt @@ -12,6 +12,11 @@ target_link_libraries( $<$:OxOrganicClaw> ) +install(TARGETS OxClaw + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + if(OX_RUN_TESTS) add_subdirectory(test) -endif() \ No newline at end of file +endif() diff --git a/deps/ox/src/ox/event/CMakeLists.txt b/deps/ox/src/ox/event/CMakeLists.txt index a343ebb1..c7c3c69d 100644 --- a/deps/ox/src/ox/event/CMakeLists.txt +++ b/deps/ox/src/ox/event/CMakeLists.txt @@ -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() \ No newline at end of file +endif() diff --git a/deps/ox/src/ox/fs/CMakeLists.txt b/deps/ox/src/ox/fs/CMakeLists.txt index 7405d4cc..8d8b2f18 100644 --- a/deps/ox/src/ox/fs/CMakeLists.txt +++ b/deps/ox/src/ox/fs/CMakeLists.txt @@ -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) diff --git a/deps/ox/src/ox/logconn/CMakeLists.txt b/deps/ox/src/ox/logconn/CMakeLists.txt index df3db221..9dfa49d9 100644 --- a/deps/ox/src/ox/logconn/CMakeLists.txt +++ b/deps/ox/src/ox/logconn/CMakeLists.txt @@ -29,6 +29,6 @@ install( install( TARGETS OxLogConn - LIBRARY DESTINATION lib/ox - ARCHIVE DESTINATION lib/ox + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) diff --git a/deps/ox/src/ox/mc/CMakeLists.txt b/deps/ox/src/ox/mc/CMakeLists.txt index 6d07d123..6a67be54 100644 --- a/deps/ox/src/ox/mc/CMakeLists.txt +++ b/deps/ox/src/ox/mc/CMakeLists.txt @@ -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) diff --git a/deps/ox/src/ox/model/CMakeLists.txt b/deps/ox/src/ox/model/CMakeLists.txt index 39e2e5cc..5973a98d 100644 --- a/deps/ox/src/ox/model/CMakeLists.txt +++ b/deps/ox/src/ox/model/CMakeLists.txt @@ -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) diff --git a/deps/ox/src/ox/oc/CMakeLists.txt b/deps/ox/src/ox/oc/CMakeLists.txt index b428ae2a..eda8de09 100644 --- a/deps/ox/src/ox/oc/CMakeLists.txt +++ b/deps/ox/src/ox/oc/CMakeLists.txt @@ -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) diff --git a/deps/ox/src/ox/preloader/CMakeLists.txt b/deps/ox/src/ox/preloader/CMakeLists.txt index bfd3332f..fb76f4b4 100644 --- a/deps/ox/src/ox/preloader/CMakeLists.txt +++ b/deps/ox/src/ox/preloader/CMakeLists.txt @@ -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 +) diff --git a/deps/ox/src/ox/std/CMakeLists.txt b/deps/ox/src/ox/std/CMakeLists.txt index 9ece6e61..d9d118ac 100644 --- a/deps/ox/src/ox/std/CMakeLists.txt +++ b/deps/ox/src/ox/std/CMakeLists.txt @@ -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)