misc: fix for release 3

Author: inlife

.github/workflows/notify-release.yml

@@ -30,43 +30,43 @@ jobs:
       - name: Run Windows build
         run: cmake --build build --config Release
       - name: Run unit tests
-        run: cd build ; .\Release\enet_test.exe
+        run: cd build ; .\enet_test.exe
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: build/Release/enet.dll
+          files: build/enet_shared.dll
 
   build-lin:
     name: Test Linux
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - name: Run cmake generator
-        run: cmake -B build -DENET_TEST=1 -DENET_SHARED=1
+        run: cmake -B build -DENET_TEST=1 -DENET_SHARED=1 -DCMAKE_BUILD_TYPE=Release
       - name: Run build on Linux
-        run: cmake --build build --config Release
+        run: cmake --build build
       - name: Test build on Linux
-        run: build/Release/enet_test
+        run: build/enet_test
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: build/Release/libenet.so
+          files: build/libenet_shared.so
 
   build-mac:
     name: Test macOS
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v1
       - name: Run cmake generator
-        run: cmake -B build -DENET_TEST=1 -DENET_SHARED=1
+        run: cmake -B build -DENET_TEST=1 -DENET_SHARED=1 -DCMAKE_BUILD_TYPE=Release
       - name: Run build on macOS
-        run: cmake --build build --config Release
+        run: cmake --build build
       - name: Test build on macOS
-        run: build/Release/enet_test
+        run: build/enet_test
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: build/Release/libenet.dylib
+          files: build/libenet_shared.dylib

.github/workflows/tests.yml

@@ -35,11 +35,11 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Run cmake generator
-        run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DENET_TEST=1 -DENET_SHARED=1
+        run: cmake -B build -DENET_TEST=1
       - name: Run Windows build
         run: cmake --build build
       - name: Run unit tests
-        run: cd build ; .\Release\enet_test.exe
+        run: cd build ; .\enet_test.exe
 
   build-lin:
     name: Test Linux
@@ -48,11 +48,11 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Run cmake generator
-        run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DENET_TEST=1 -DENET_SHARED=1
+        run: cmake -B build -DENET_TEST=1
       - name: Run build on Linux
         run: cmake --build build
       - name: Test build on Linux
-        run: build/Release/enet_test
+        run: build/enet_test
 
   build-mac:
     name: Test macOS
@@ -61,11 +61,11 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Run cmake generator
-        run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DENET_TEST=1 -DENET_SHARED=1
+        run: cmake -B build -DENET_TEST=1
       - name: Run build on macOS
         run: cmake --build build
       - name: Test build on macOS
-        run: build/Release/enet_test
+        run: build/enet_test
 
   done:
     name: Notify about status

CMakeLists.txt

@@ -1,27 +1,38 @@
 cmake_minimum_required(VERSION 3.0)
 project(enet C)
 
-# defaults
-set(ENET_STATIC ON)
-set(ENET_SHARED OFF)
-set(ENET_TEST OFF)
-
 # configure projects
 if (ENET_STATIC)
-    add_library(enet STATIC test/library.c)
+    add_library(enet_static STATIC test/library.c)
 
     if (WIN32)
-        target_link_libraries(enet PUBLIC winmm ws2_32)
+        target_link_libraries(enet_static PUBLIC winmm ws2_32)
+
+        if(MSVC)
+            target_compile_options(enet_static PRIVATE -W3)
+        endif()
+    else()
+        target_compile_options(enet_static PRIVATE -Wno-error)
     endif()
+
+    target_include_directories(enet_static PUBLIC ${PROJECT_SOURCE_DIR}/include)
 endif()
 
 if (ENET_SHARED)
-    target_compile_definitions(enet PUBLIC -DENET_DLL)
-    add_library(enet SHARED test/library.c)
+    add_library(enet_shared SHARED test/library.c)
+    target_compile_definitions(enet_shared PUBLIC -DENET_DLL)
 
     if (WIN32)
-        target_link_libraries(enet PUBLIC winmm ws2_32)
+        target_link_libraries(enet_shared PUBLIC winmm ws2_32)
+
+        if(MSVC)
+            target_compile_options(enet_shared PRIVATE -W3)
+        endif()
+    else()
+        target_compile_options(enet_shared PRIVATE -Wno-error)
     endif()
+
+    target_include_directories(enet_shared PUBLIC ${PROJECT_SOURCE_DIR}/include)
 endif()
 
 if (ENET_TEST)
@@ -33,11 +44,3 @@ if (ENET_TEST)
     endif()
 endif()
 
-
-if(MSVC)
-    target_compile_options(enet PRIVATE -W3)
-else()
-    target_compile_options(enet PRIVATE -Wno-error)
-endif()
-
-target_include_directories(enet PUBLIC ${PROJECT_SOURCE_DIR}/include)