diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake index bf7e84ed3..9f0b5242f 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -1,15 +1,22 @@ -if(NOT PROTOBUF_DIR) - message(FATAL_ERROR "PROTOBUF_DIR is empty") -endif() - -set(PROTOBUF_NAME "protobuf") -set(PROTOBUF_LIB_NAME "lib${PROTOBUF_NAME}") -set(PROTOBUF_BINARY_DIR "${PROTOBUF_NAME}") - -set(${PROTOBUF_NAME}_INSTALL OFF CACHE BOOL "Install protobuf binaries and files") -set(${PROTOBUF_NAME}_BUILD_TESTS OFF CACHE BOOL "Build tests") -add_subdirectory(${PROTOBUF_DIR} ${PROTOBUF_BINARY_DIR}) -set_target_properties(${PROTOBUF_LIB_NAME} PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF) -if(WIN32) - set_target_properties(${PROTOBUF_LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -endif() \ No newline at end of file +if(NOT PROTOBUF_DIR) + message(FATAL_ERROR "PROTOBUF_DIR is empty") +endif() + +set(PROTOBUF_NAME "protobuf") +set(PROTOBUF_LIB_NAME "lib${PROTOBUF_NAME}") +set(PROTOBUF_BINARY_DIR "${PROTOBUF_NAME}") + +set(${PROTOBUF_NAME}_INSTALL OFF CACHE BOOL "Install protobuf binaries and files") +set(${PROTOBUF_NAME}_BUILD_TESTS OFF CACHE BOOL "Build tests") + +add_subdirectory(${PROTOBUF_DIR} ${PROTOBUF_BINARY_DIR}) + +set_target_properties(${PROTOBUF_LIB_NAME} PROPERTIES + CXX_STANDARD 11 + CXX_STANDARD_REQUIRED ON + CXX_EXTENSIONS OFF +) + +if(WIN32) + set_target_properties(${PROTOBUF_LIB_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +endif() diff --git a/cmake/sourcesdk/targets/entity2.cmake b/cmake/sourcesdk/targets/entity2.cmake index 7e5b15351..9b36d6981 100644 --- a/cmake/sourcesdk/targets/entity2.cmake +++ b/cmake/sourcesdk/targets/entity2.cmake @@ -44,13 +44,13 @@ set(SOURCESDK_ENTITY2_SOURCE_FILES add_library(${SOURCESDK_ENTITY2_NAME} ${SOURCESDK_ENTITY2_SOURCE_FILES}) set_target_properties(${SOURCESDK_ENTITY2_NAME} PROPERTIES - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED ON - CXX_EXTENSIONS OFF + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CXX_EXTENSIONS OFF - C_STANDARD 17 - C_STANDARD_REQUIRED ON - C_EXTENSIONS OFF + C_STANDARD 17 + C_STANDARD_REQUIRED ON + C_EXTENSIONS OFF ) set_target_properties(${SOURCESDK_ENTITY2_NAME} PROPERTIES OUTPUT_NAME ${SOURCESDK_ENTITY2_OUTPUT_NAME}) diff --git a/cmake/sourcesdk/targets/interfaces.cmake b/cmake/sourcesdk/targets/interfaces.cmake index 8f57a79eb..ef9033164 100644 --- a/cmake/sourcesdk/targets/interfaces.cmake +++ b/cmake/sourcesdk/targets/interfaces.cmake @@ -36,13 +36,13 @@ set(SOURCESDK_INTERFACES_SOURCE_FILES add_library(${SOURCESDK_INTERFACES_NAME} ${SOURCESDK_INTERFACES_SOURCE_FILES}) set_target_properties(${SOURCESDK_INTERFACES_NAME} PROPERTIES - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED ON - CXX_EXTENSIONS OFF + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CXX_EXTENSIONS OFF - C_STANDARD 17 - C_STANDARD_REQUIRED ON - C_EXTENSIONS OFF + C_STANDARD 17 + C_STANDARD_REQUIRED ON + C_EXTENSIONS OFF ) set_target_properties(${SOURCESDK_INTERFACES_NAME} PROPERTIES OUTPUT_NAME ${SOURCESDK_INTERFACES_OUTPUT_NAME}) diff --git a/cmake/sourcesdk/targets/mathlib.cmake b/cmake/sourcesdk/targets/mathlib.cmake index 2487ba517..9de1adef0 100644 --- a/cmake/sourcesdk/targets/mathlib.cmake +++ b/cmake/sourcesdk/targets/mathlib.cmake @@ -55,13 +55,13 @@ set(SOURCESDK_MATHLIB_SOURCE_FILES add_library(${SOURCESDK_MATHLIB_NAME} ${SOURCESDK_MATHLIB_SOURCE_FILES}) set_target_properties(${SOURCESDK_MATHLIB_NAME} PROPERTIES - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED ON - CXX_EXTENSIONS OFF + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CXX_EXTENSIONS OFF - C_STANDARD 17 - C_STANDARD_REQUIRED ON - C_EXTENSIONS OFF + C_STANDARD 17 + C_STANDARD_REQUIRED ON + C_EXTENSIONS OFF ) set_target_properties(${SOURCESDK_MATHLIB_NAME} PROPERTIES OUTPUT_NAME ${SOURCESDK_MATHLIB_OUTPUT_NAME})