Merge remote-tracking branch 'origin/master'
# Conflicts: # CMakeLists.txt
This commit is contained in:
@@ -10,18 +10,19 @@ endif()
|
||||
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
|
||||
if (WIN32)
|
||||
set(CMAKE_CXX_FLAGS "-municode")
|
||||
endif()
|
||||
|
||||
|
||||
file(GLOB_RECURSE SOURCES "src/*.cpp")
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
include_directories(${PROJECT_SOURCE_DIR}/include)
|
||||
include_directories("include")
|
||||
|
||||
add_library(Event SHARED ${SOURCES})
|
||||
if (UNIX)
|
||||
add_library(Event SHARED ${SOURCES})
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
add_library(Event STATIC ${SOURCES})
|
||||
endif()
|
||||
|
||||
set_target_properties(Event PROPERTIES LINKER_LANGUAGE CXX)
|
||||
|
||||
|
Reference in New Issue
Block a user