cmake: merge librw_skeleton_imgui in librw_skeleton

tools/CMakeLists.txt

@@ -1,18 +1,20 @@
-if(NOT LIBRW_PLATFORM_PS2)
+if(LIBRW_TOOLS AND NOT LIBRW_PLATFORM_PS2)
     add_subdirectory(dumprwtree)
     add_subdirectory(ska2anm)
 endif()
 
-if(TARGET librw_skeleton_imgui)
-    add_subdirectory(imguitest)
-    add_subdirectory(playground)
-    add_subdirectory(lights)
-    add_subdirectory(subrast)
-    add_subdirectory(camera)
-    add_subdirectory(im2d)
-    add_subdirectory(im3d)
-endif()
+if(LIBRW_EXAMPLES)
+    if(TARGET librw::skeleton)
+        add_subdirectory(imguitest)
+        add_subdirectory(playground)
+        add_subdirectory(lights)
+        add_subdirectory(subrast)
+        add_subdirectory(camera)
+        add_subdirectory(im2d)
+        add_subdirectory(im3d)
+    endif()
 
-if(LIBRW_PLATFORM_PS2)
-    add_subdirectory(ps2test)
+    if(LIBRW_PLATFORM_PS2)
+        add_subdirectory(ps2test)
+    endif()
 endif()

tools/camera/CMakeLists.txt

@@ -1,15 +1,18 @@
 add_executable(camera WIN32
-    main.cpp camexamp.cpp viewer.cpp
+    main.cpp
+    camexamp.cpp
+    viewer.cpp
 )
 
 target_link_libraries(camera
-    PUBLIC
-        librw librw_skeleton librw_skeleton_imgui
+    PRIVATE
+        librw::skeleton
+        librw::librw
 )
 
 add_custom_command(
     TARGET camera POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E copy_directory  "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:camera>/files"
+    COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "$<TARGET_FILE_DIR:camera>/files"
 )
 
 librw_platform_target(camera)

tools/dumprwtree/CMakeLists.txt

@@ -3,8 +3,8 @@ add_executable(dumprwtree
 )
 
 target_link_libraries(dumprwtree
-    PUBLIC
-        librw
+    PRIVATE
+        librw::librw
 )
 
 if(LIBRW_INSTALL)

tools/im2d/CMakeLists.txt

@@ -1,10 +1,17 @@
 add_executable(im2d WIN32
-    im2d.cpp linelist.cpp main.cpp polyline.cpp trifan.cpp trilist.cpp tristrip.cpp
+    im2d.cpp
+    linelist.cpp
+    main.cpp
+    polyline.cpp
+    trifan.cpp
+    trilist.cpp
+    tristrip.cpp
 )
 
 target_link_libraries(im2d
-    PUBLIC
-        librw librw_skeleton librw_skeleton_imgui
+    PRIVATE
+        librw::skeleton
+        librw::librw
 )
 
 add_custom_command(

tools/im3d/CMakeLists.txt

@@ -1,10 +1,17 @@
 add_executable(im3d WIN32
-    im3d.cpp linelist.cpp main.cpp polyline.cpp trifan.cpp trilist.cpp tristrip.cpp
+    im3d.cpp
+    linelist.cpp
+    main.cpp
+    polyline.cpp
+    trifan.cpp
+    trilist.cpp
+    tristrip.cpp
 )
 
 target_link_libraries(im3d
-    PUBLIC
-        librw librw_skeleton librw_skeleton_imgui
+    PRIVATE
+        librw::skeleton
+        librw::librw
 )
 
 add_custom_command(

tools/imguitest/CMakeLists.txt

@@ -4,8 +4,8 @@ add_executable(imguitest WIN32
 
 target_link_libraries(imguitest
     PUBLIC
-        librw
-        librw_skeleton_imgui
+        librw::skeleton
+        librw::librw
 )
 
 if(LIBRW_INSTALL)

tools/lights/CMakeLists.txt

@@ -1,10 +1,12 @@
 add_executable(lights WIN32
-    main.cpp lights.cpp
+    main.cpp
+    lights.cpp
 )
 
 target_link_libraries(lights
-    PUBLIC
-        librw librw_skeleton librw_skeleton_imgui
+    PRIVATE
+        librw::skeleton
+        librw::librw
 )
 
 add_custom_command(

tools/playground/CMakeLists.txt

@@ -1,10 +1,16 @@
 add_executable(playground WIN32
-    camera.cpp font.cpp main.cpp ras_test.cpp splines.cpp tl_tests.cpp
+    camera.cpp
+    font.cpp
+    main.cpp
+    ras_test.cpp
+    splines.cpp
+    tl_tests.cpp
 )
 
 target_link_libraries(playground
-    PUBLIC
-        librw librw_skeleton_imgui
+    PRIVATE
+        librw::skeleton
+        librw::librw
 )
 
 add_custom_command(

tools/ps2test/CMakeLists.txt

@@ -8,18 +8,15 @@ add_executable(ps2test
 )
 
 target_link_libraries(ps2test
-    PUBLIC
-        librw
+    PRIVATE
+        librw::librw
         kernel
 )
 
-add_erl_executable(PS2TEST_ERL ps2test)
+librw_platform_target(ps2test)
 
 if(LIBRW_INSTALL)
     install(TARGETS ps2test
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
     )
-    install(FILES "${PS2TEST_ERL}"
-        DESTINATION "${CMAKE_INSTALL_BINDIR}"
-    )
 endif()

tools/ska2anm/CMakeLists.txt

@@ -4,7 +4,13 @@ add_executable(ska2anm
 
 target_link_libraries(ska2anm
     PUBLIC
-        librw
+        librw::librw
 )
 
-librw_platform_target(ska2anm)
+librw_platform_target(ska2anm INSTALL)
+
+if(LIBRW_INSTALL)
+    install(TARGETS ska2anm
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()

tools/subrast/CMakeLists.txt

@@ -4,7 +4,8 @@ add_executable(subrast WIN32
 
 target_link_libraries(subrast
     PUBLIC
-        librw librw_skeleton librw_skeleton_imgui
+        librw::skeleton
+        librw::librw
 )
 
 librw_platform_target(subrast)