diff --git a/3rd_Party/CMakeLists.txt b/3rd_Party/CMakeLists.txt index 6bf847e..7de8d6d 100644 --- a/3rd_Party/CMakeLists.txt +++ b/3rd_Party/CMakeLists.txt @@ -6,29 +6,29 @@ set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON SYSTEM ON) set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) # SDL3 -if (NOT TARGET SDL3::SDL3) - set(SDL_DISKAUDIO OFF) - set(SDL_TEST_LIBRARY OFF) - set(SDL_PIPEWIRE OFF) - add_subdirectory(SDL3) -endif() +#if (NOT TARGET SDL3::SDL3) +# set(SDL_DISKAUDIO OFF) +# set(SDL_TEST_LIBRARY OFF) +# set(SDL_PIPEWIRE OFF) +# add_subdirectory(SDL3) +#endif() # ImGui -set(IMGUI_SRC - imgui/imgui.cpp - imgui/imgui_demo.cpp - imgui/imgui_draw.cpp - imgui/imgui_tables.cpp - imgui/imgui_widgets.cpp - imgui/backends/imgui_impl_sdl3.cpp - imgui/backends/imgui_impl_opengl3.cpp -) -add_library(imgui STATIC ${IMGUI_SRC}) -target_link_libraries(imgui PRIVATE SDL3::SDL3) -target_include_directories(imgui PUBLIC - imgui - imgui/backends -) +#set(IMGUI_SRC +# imgui/imgui.cpp +# imgui/imgui_demo.cpp +# imgui/imgui_draw.cpp +# imgui/imgui_tables.cpp +# imgui/imgui_widgets.cpp +# imgui/backends/imgui_impl_sdl3.cpp +# imgui/backends/imgui_impl_opengl3.cpp +#) +#add_library(imgui STATIC ${IMGUI_SRC}) +#target_link_libraries(imgui PRIVATE SDL3::SDL3) +#target_include_directories(imgui PUBLIC +# imgui +# imgui/backends +#) # GoogleTest add_subdirectory(googletest) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fac123..92d1bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,9 +20,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # ---- Dependency Discovery ---- #------------------------------- -find_package(OpenGL REQUIRED) -find_package(fmt 10.2.1 CONFIG) -find_package(SDL3 3.2.10 CONFIG) +#find_package(OpenGL REQUIRED) +#find_package(fmt 10.2.1 CONFIG) +#find_package(SDL3 3.2.10 CONFIG) message(STATUS "Verifying Git submodules integrity...") @@ -97,6 +97,11 @@ add_executable(Pound src/main.cpp ) +set(TEST_SRC + ${CMAKE_CURRENT_SOURCE_DIR}/tests/jit/ir/test_value.cpp +) +add_executable(tests ${TEST_SRC}) + add_subdirectory(3rd_Party) add_subdirectory(src/common) add_subdirectory(src/host) @@ -129,6 +134,7 @@ foreach(TARGET ${POUND_PROJECT_TARGETS}) -Wcast-qual -Wcast-align -Wconversion> + -Wno-gnu-zero-variadic-macro-arguments ) if(WIN32) @@ -160,18 +166,9 @@ target_link_libraries(Pound PRIVATE #imgui ) -set(TEST_SRC - ${CMAKE_CURRENT_SOURCE_DIR}/tests/jit/ir/test_value.cpp -) -add_executable(tests ${TEST_SRC}) target_link_libraries(tests PRIVATE jit gtest gtest_main ) - -target_include_directories(jit PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. -)