Green-Sky/solanaceae_ecosystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always exporting, rollingback the funky stuff

Browse Source
This commit is contained in:
Green Sky 2024-05-28 11:57:11 +02:00
parent ab8cc6dde1
commit a5c26e6b51
No known key found for this signature in database
3 changed files with 14 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/ci.yml vendored
View File

@ -29,12 +29,6 @@ jobs:
- name: Build - name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
- name: Reconfig CMake for export
run: cmake ${{github.workspace}}/build -DSOLANACEAE_ECOSYSTEM_BUILD_PLUGINS=OFF
- name: Build with export
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3
- name: Test - name: Test
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}} run: ctest -C ${{env.BUILD_TYPE}}
@ -58,12 +52,6 @@ jobs:
- name: Build - name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3 run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3
- name: Reconfig CMake for export
run: cmake ${{github.workspace}}/build -DSOLANACEAE_ECOSYSTEM_BUILD_PLUGINS=OFF
- name: Build with export
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3
- name: Test - name: Test
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}} run: ctest -C ${{env.BUILD_TYPE}}
@ -98,12 +86,6 @@ jobs:
- name: Build - name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3 run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3
- name: Reconfig CMake for export
run: cmake ${{github.workspace}}/build -DSOLANACEAE_ECOSYSTEM_BUILD_PLUGINS=OFF
- name: Build with export
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 3
- name: Test - name: Test
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}} run: ctest -C ${{env.BUILD_TYPE}}

18
CMakeLists.txt
View File

@ -18,19 +18,12 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
option(SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS "Build plugins and not hosts (totato)" ON)
option(SOLANACEAE_ECOSYSTEM_BUILD_TESTING "Build tests" ${BUILD_TESTING}) option(SOLANACEAE_ECOSYSTEM_BUILD_TESTING "Build tests" ${BUILD_TESTING})
message("II SOLANACEAE_ECOSYSTEM_BUILD_TESTING " ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING}) message("II SOLANACEAE_ECOSYSTEM_BUILD_TESTING " ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING})
if (SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS) # uggly, but it needs to be defined for all dependencies too
# uggly, but it needs to be defined for all dependencies too # what if its always export?
# but this also means that we can not compile a host in the same cmake run as plugins add_compile_definitions(ENTT_API_EXPORT)
#add_compile_definitions(ENTT_API_IMPORT)
# what if its always export?
add_compile_definitions(ENTT_API_EXPORT)
else()
add_compile_definitions(ENTT_API_EXPORT)
endif()
if (SOLANACEAE_ECOSYSTEM_BUILD_TESTING) if (SOLANACEAE_ECOSYSTEM_BUILD_TESTING)
include(CTest) include(CTest)
@ -69,7 +62,4 @@ endif()
# cmake setup end # cmake setup end
if (SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS) add_subdirectory(./plugins)
add_subdirectory(./plugins)
endif()

23
external/CMakeLists.txt vendored
View File

@ -8,42 +8,39 @@ add_subdirectory(./entt)
add_subdirectory(./solanaceae_contact) add_subdirectory(./solanaceae_contact)
add_subdirectory(./solanaceae_message3) add_subdirectory(./solanaceae_message3)
set(SOLANACEAE_BRIDGE_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_BRIDGE_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_bridge) add_subdirectory(./solanaceae_bridge)
set(SOLANACEAE_OBJECT_STORE_BUILD_TESTING ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING}) set(SOLANACEAE_OBJECT_STORE_BUILD_TESTING ON)
add_subdirectory(./solanaceae_object_store) add_subdirectory(./solanaceae_object_store)
add_subdirectory(./solanaceae_message_serializer) add_subdirectory(./solanaceae_message_serializer)
set(SOLANACEAE_MESSAGE_FRAGMENT_STORE_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_MESSAGE_FRAGMENT_STORE_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_message_fragment_store) add_subdirectory(./solanaceae_message_fragment_store)
add_subdirectory(./toxcore) add_subdirectory(./toxcore)
add_subdirectory(./solanaceae_toxcore) add_subdirectory(./solanaceae_toxcore)
add_subdirectory(./solanaceae_tox) add_subdirectory(./solanaceae_tox)
set(SOLANACEAE_TOX_UPNP_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_TOX_UPNP_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_tox_upnp) add_subdirectory(./solanaceae_tox_upnp)
add_subdirectory(./solanaceae_ngc_ft1) add_subdirectory(./solanaceae_ngc_ft1)
set(SOLANACEAE_ZOX_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_ZOX_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_zox) add_subdirectory(./solanaceae_zox)
set(SOLANACEAE_TOXIC_GAMES_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_TOXIC_GAMES_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_toxic_games) add_subdirectory(./solanaceae_toxic_games)
set(SOLANACEAE_IRCCLIENT_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_IRCCLIENT_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_ircclient) add_subdirectory(./solanaceae_ircclient)
set(SOLANACEAE_CRDTNOTES_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_CRDTNOTES_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_crdtnotes) add_subdirectory(./solanaceae_crdtnotes)
set(SOLANACEAE_LLAMA-CPP-WEB_BUILD_PLUGINS ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS}) set(SOLANACEAE_LLAMA-CPP-WEB_BUILD_PLUGINS ON)
add_subdirectory(./solanaceae_llama-cpp-web) add_subdirectory(./solanaceae_llama-cpp-web)
# plugins and hosts are mutally exclusive add_subdirectory(./totato)
if (NOT ${SOLANACEAE_ECOSYSTEM_BUILD_PLUGINS})
add_subdirectory(./totato)
endif()