From f577183c24786973a19baf9277d412f14280bde4 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 23 Dec 2019 00:08:42 +0100 Subject: [PATCH] build system: BUILD_PLUGIN is no longer required, plugins are libs --- .github/workflows/build.yml | 6 +-- .github/workflows/coverage.yml | 2 +- CMakeLists.txt | 1 - test/CMakeLists.txt | 38 +++++++++---------- .../dispatcher_plugin}/main.cpp | 0 .../dispatcher_plugin}/plugin.cpp | 0 .../dispatcher_plugin}/types.h | 0 .../emitter => lib/emitter_plugin}/main.cpp | 0 .../emitter => lib/emitter_plugin}/plugin.cpp | 0 .../emitter => lib/emitter_plugin}/types.h | 0 .../{plugin/meta => lib/meta_plugin}/main.cpp | 0 .../meta => lib/meta_plugin}/plugin.cpp | 0 test/{plugin/meta => lib/meta_plugin}/types.h | 0 .../registry => lib/registry_plugin}/main.cpp | 0 .../registry_plugin}/plugin.cpp | 0 .../registry => lib/registry_plugin}/types.h | 0 16 files changed, 21 insertions(+), 26 deletions(-) rename test/{plugin/dispatcher => lib/dispatcher_plugin}/main.cpp (100%) rename test/{plugin/dispatcher => lib/dispatcher_plugin}/plugin.cpp (100%) rename test/{plugin/dispatcher => lib/dispatcher_plugin}/types.h (100%) rename test/{plugin/emitter => lib/emitter_plugin}/main.cpp (100%) rename test/{plugin/emitter => lib/emitter_plugin}/plugin.cpp (100%) rename test/{plugin/emitter => lib/emitter_plugin}/types.h (100%) rename test/{plugin/meta => lib/meta_plugin}/main.cpp (100%) rename test/{plugin/meta => lib/meta_plugin}/plugin.cpp (100%) rename test/{plugin/meta => lib/meta_plugin}/types.h (100%) rename test/{plugin/registry => lib/registry_plugin}/main.cpp (100%) rename test/{plugin/registry => lib/registry_plugin}/plugin.cpp (100%) rename test/{plugin/registry => lib/registry_plugin}/types.h (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92c96b26b..378fd560a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: env: CXX: ${{ matrix.compiler }} run: | - cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON -DBUILD_PLUGIN=ON .. + cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON .. make -j4 - name: Run tests working-directory: build @@ -49,7 +49,7 @@ jobs: - name: Compile tests working-directory: build run: | - cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON -DBUILD_PLUGIN=ON ${{ matrix.toolset_option }} .. + cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON ${{ matrix.toolset_option }} .. cmake --build . -j 4 - name: Run tests working-directory: build @@ -66,7 +66,7 @@ jobs: - name: Compile tests working-directory: build run: | - cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON -DBUILD_PLUGIN=ON .. + cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON .. make -j4 - name: Run tests working-directory: build diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c3110eb71..ab3082d2e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -16,7 +16,7 @@ jobs: CXXFLAGS: "-O0 --coverage -fno-inline -fno-inline-small-functions -fno-default-inline" CXX: g++ run: | - cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON -DBUILD_PLUGIN=ON .. + cmake -DBUILD_TESTING=ON -DBUILD_LIB=ON .. make -j4 - name: Run tests working-directory: build diff --git a/CMakeLists.txt b/CMakeLists.txt index 492bdb894..de8e21447 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,6 @@ if(BUILD_TESTING) option(BUILD_BENCHMARK "Build benchmark." OFF) option(BUILD_LIB "Build lib example." OFF) option(BUILD_MOD "Build mod example." OFF) - option(BUILD_PLUGIN "Build plugin example." OFF) option(BUILD_SNAPSHOT "Build snapshot example." OFF) enable_testing() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dba6b41ec..7fc9da12a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -56,14 +56,14 @@ macro(SETUP_LIB_TEST TEST_NAME) endmacro() macro(SETUP_PLUGIN_TEST TEST_NAME) - add_library(_${TEST_NAME}_plugin MODULE plugin/${TEST_NAME}/plugin.cpp) - SETUP_TARGET(_${TEST_NAME}_plugin) - SETUP_BASIC_TEST(lib_${TEST_NAME}_plugin plugin/${TEST_NAME}/main.cpp) - target_link_libraries(lib_${TEST_NAME}_plugin PRIVATE ${CMAKE_DL_LIBS}) - target_include_directories(lib_${TEST_NAME}_plugin PRIVATE ${CR_SRC_DIR}) - target_compile_definitions(lib_${TEST_NAME}_plugin PRIVATE NOMINMAX PLUGIN="$") - target_include_directories(_${TEST_NAME}_plugin PRIVATE ${CR_SRC_DIR}) - target_compile_definitions(_${TEST_NAME}_plugin PRIVATE NOMINMAX) + add_library(_${TEST_NAME} MODULE lib/${TEST_NAME}/plugin.cpp) + SETUP_TARGET(_${TEST_NAME}) + SETUP_BASIC_TEST(lib_${TEST_NAME} lib/${TEST_NAME}/main.cpp) + target_link_libraries(lib_${TEST_NAME} PRIVATE ${CMAKE_DL_LIBS}) + target_include_directories(lib_${TEST_NAME} PRIVATE ${CR_SRC_DIR}) + target_compile_definitions(lib_${TEST_NAME} PRIVATE NOMINMAX PLUGIN="$") + target_include_directories(_${TEST_NAME} PRIVATE ${CR_SRC_DIR}) + target_compile_definitions(_${TEST_NAME} PRIVATE NOMINMAX) endmacro() # Test benchmark @@ -75,25 +75,21 @@ endif() # Test lib if(BUILD_LIB) - SETUP_LIB_TEST(dispatcher) - SETUP_LIB_TEST(emitter) - SETUP_LIB_TEST(meta) - SETUP_LIB_TEST(registry) -endif() - -# Test plugin - -if(BUILD_PLUGIN) set(CR_DEPS_DIR ${EnTT_SOURCE_DIR}/deps/cr) configure_file(${EnTT_SOURCE_DIR}/cmake/in/cr.in ${CR_DEPS_DIR}/CMakeLists.txt) execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY ${CR_DEPS_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY ${CR_DEPS_DIR}) set(CR_SRC_DIR ${CR_DEPS_DIR}/src) - SETUP_PLUGIN_TEST(dispatcher) - SETUP_PLUGIN_TEST(emitter) - SETUP_PLUGIN_TEST(meta) - SETUP_PLUGIN_TEST(registry) + SETUP_LIB_TEST(dispatcher) + SETUP_LIB_TEST(emitter) + SETUP_LIB_TEST(meta) + SETUP_LIB_TEST(registry) + + SETUP_PLUGIN_TEST(dispatcher_plugin) + SETUP_PLUGIN_TEST(emitter_plugin) + SETUP_PLUGIN_TEST(meta_plugin) + SETUP_PLUGIN_TEST(registry_plugin) endif() # Test mod diff --git a/test/plugin/dispatcher/main.cpp b/test/lib/dispatcher_plugin/main.cpp similarity index 100% rename from test/plugin/dispatcher/main.cpp rename to test/lib/dispatcher_plugin/main.cpp diff --git a/test/plugin/dispatcher/plugin.cpp b/test/lib/dispatcher_plugin/plugin.cpp similarity index 100% rename from test/plugin/dispatcher/plugin.cpp rename to test/lib/dispatcher_plugin/plugin.cpp diff --git a/test/plugin/dispatcher/types.h b/test/lib/dispatcher_plugin/types.h similarity index 100% rename from test/plugin/dispatcher/types.h rename to test/lib/dispatcher_plugin/types.h diff --git a/test/plugin/emitter/main.cpp b/test/lib/emitter_plugin/main.cpp similarity index 100% rename from test/plugin/emitter/main.cpp rename to test/lib/emitter_plugin/main.cpp diff --git a/test/plugin/emitter/plugin.cpp b/test/lib/emitter_plugin/plugin.cpp similarity index 100% rename from test/plugin/emitter/plugin.cpp rename to test/lib/emitter_plugin/plugin.cpp diff --git a/test/plugin/emitter/types.h b/test/lib/emitter_plugin/types.h similarity index 100% rename from test/plugin/emitter/types.h rename to test/lib/emitter_plugin/types.h diff --git a/test/plugin/meta/main.cpp b/test/lib/meta_plugin/main.cpp similarity index 100% rename from test/plugin/meta/main.cpp rename to test/lib/meta_plugin/main.cpp diff --git a/test/plugin/meta/plugin.cpp b/test/lib/meta_plugin/plugin.cpp similarity index 100% rename from test/plugin/meta/plugin.cpp rename to test/lib/meta_plugin/plugin.cpp diff --git a/test/plugin/meta/types.h b/test/lib/meta_plugin/types.h similarity index 100% rename from test/plugin/meta/types.h rename to test/lib/meta_plugin/types.h diff --git a/test/plugin/registry/main.cpp b/test/lib/registry_plugin/main.cpp similarity index 100% rename from test/plugin/registry/main.cpp rename to test/lib/registry_plugin/main.cpp diff --git a/test/plugin/registry/plugin.cpp b/test/lib/registry_plugin/plugin.cpp similarity index 100% rename from test/plugin/registry/plugin.cpp rename to test/lib/registry_plugin/plugin.cpp diff --git a/test/plugin/registry/types.h b/test/lib/registry_plugin/types.h similarity index 100% rename from test/plugin/registry/types.h rename to test/lib/registry_plugin/types.h