Skip to content

Commit 8d3453e

Browse files
committed
Merge branch 'dev' of https://github.com/Daynlight/CWindow into dev
2 parents 3dc079b + 3d98fdc commit 8d3453e

1 file changed

Lines changed: 22 additions & 7 deletions

File tree

CWindow/CMakeLists.txt

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Root directory of the proje
88
set(CMAKE_CXX_STANDARD 23)
99
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1010

11-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
12-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pg")
13-
set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -pg")
14-
endif()
15-
1611

1712

1813
############# [Set Variables] #############
@@ -39,12 +34,27 @@ message("Used Renderer: ${RENDERER}")
3934
############# [Setup project] #############
4035
project(CWindow LANGUAGES CXX C)
4136

37+
if(PLATFORM STREQUAL "Windows")
38+
set(ASSIMP_WARNINGS_AS_ERRORS OFF CACHE BOOL "" FORCE)
39+
set(ASSIMP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
40+
endif()
41+
4242
### Vendor Libs
4343
add_subdirectory(vendor/glfw)
4444
add_subdirectory(vendor/glm)
45-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
4645
add_subdirectory(vendor/assimp)
4746

47+
if(PLATFORM STREQUAL "Windows")
48+
if(TARGET assimp)
49+
target_compile_options(assimp PRIVATE -Wno-unused-but-set-variable)
50+
endif()
51+
endif()
52+
53+
54+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
55+
add_compile_options(-g -pg)
56+
endif()
57+
4858

4959
### Subfolders
5060
add_subdirectory(Renderer)
@@ -55,4 +65,9 @@ set(src
5565
)
5666

5767
add_library(CWindow STATIC ${src})
58-
target_link_libraries(CWindow PUBLIC Renderer Gui)
68+
target_link_libraries(CWindow PUBLIC Renderer Gui)
69+
70+
71+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
72+
target_link_options(CWindow INTERFACE -pg)
73+
endif()

0 commit comments

Comments
 (0)