JCS-Prod/RDI
0
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Force correct cpplib in cmake

Browse Source
This commit is contained in:
JackCarterSmith 2023-02-04 12:13:00 +01:00
parent 7181d65a6e
commit c8e1ff66a2
Signed by: JackCarterSmith
GPG Key ID: 832E52F4E23F8F24
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -82,6 +82,8 @@ if(RDI_SHARED)
add_library(rdi-lib SHARED ${RDI_LIB_SOURCES}) add_library(rdi-lib SHARED ${RDI_LIB_SOURCES})
set_property(TARGET rdi-lib PROPERTY C_STANDARD 17) set_property(TARGET rdi-lib PROPERTY C_STANDARD 17)
set_property(TARGET rdi-lib PROPERTY CXX_STANDARD 17) set_property(TARGET rdi-lib PROPERTY CXX_STANDARD 17)
set_property(TARGET rdi-lib PROPERTY C_STANDARD_REQUIRED ON)
set_property(TARGET rdi-lib PROPERTY CXX_STANDARD_REQUIRED ON)
set_property(TARGET rdi-lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL") set_property(TARGET rdi-lib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
set_target_properties(rdi-lib PROPERTIES VERSION 1.0.0) set_target_properties(rdi-lib PROPERTIES VERSION 1.0.0)
@ -123,6 +125,8 @@ if(RDI_STATIC)
add_library(rdi-libstatic STATIC ${RDI_LIB_SOURCES}) add_library(rdi-libstatic STATIC ${RDI_LIB_SOURCES})
set_property(TARGET rdi-libstatic PROPERTY C_STANDARD 17) set_property(TARGET rdi-libstatic PROPERTY C_STANDARD 17)
set_property(TARGET rdi-libstatic PROPERTY CXX_STANDARD 17) set_property(TARGET rdi-libstatic PROPERTY CXX_STANDARD 17)
set_property(TARGET rdi-libstatic PROPERTY C_STANDARD_REQUIRED ON)
set_property(TARGET rdi-libstatic PROPERTY CXX_STANDARD_REQUIRED ON)
set_property(TARGET rdi-libstatic PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL") set_property(TARGET rdi-libstatic PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
set_target_properties(rdi-libstatic PROPERTIES VERSION 1.0.0) set_target_properties(rdi-libstatic PROPERTIES VERSION 1.0.0)
@ -177,18 +181,24 @@ if(BUILD_TOOLS)
add_executable(rdi-debug-tools ./tools/RDIDebug.cpp) add_executable(rdi-debug-tools ./tools/RDIDebug.cpp)
set_property(TARGET rdi-debug-tools PROPERTY C_STANDARD 17) set_property(TARGET rdi-debug-tools PROPERTY C_STANDARD 17)
set_property(TARGET rdi-debug-tools PROPERTY CXX_STANDARD 17) set_property(TARGET rdi-debug-tools PROPERTY CXX_STANDARD 17)
set_property(TARGET rdi-debug-tools PROPERTY C_STANDARD_REQUIRED ON)
set_property(TARGET rdi-debug-tools PROPERTY CXX_STANDARD_REQUIRED ON)
set_target_properties(rdi-debug-tools PROPERTIES OUTPUT_NAME "RDI-debug") set_target_properties(rdi-debug-tools PROPERTIES OUTPUT_NAME "RDI-debug")
list(APPEND RDI_TARGETS_LIST rdi-debug-tools) list(APPEND RDI_TARGETS_LIST rdi-debug-tools)
add_executable(erso-debug-tools ./tools/ErsoDebug.cpp) add_executable(erso-debug-tools ./tools/ErsoDebug.cpp)
set_property(TARGET erso-debug-tools PROPERTY C_STANDARD 17) set_property(TARGET erso-debug-tools PROPERTY C_STANDARD 17)
set_property(TARGET erso-debug-tools PROPERTY CXX_STANDARD 17) set_property(TARGET erso-debug-tools PROPERTY CXX_STANDARD 17)
#set_property(TARGET erso-debug-tools PROPERTY C_STANDARD_REQUIRED ON)
#set_property(TARGET erso-debug-tools PROPERTY CXX_STANDARD_REQUIRED ON)
set_target_properties(erso-debug-tools PROPERTIES OUTPUT_NAME "Erso-debug") set_target_properties(erso-debug-tools PROPERTIES OUTPUT_NAME "Erso-debug")
list(APPEND RDI_TARGETS_LIST erso-debug-tools) list(APPEND RDI_TARGETS_LIST erso-debug-tools)
add_executable(krennic-debug-tools ./tools/KrennicDebug.cpp) add_executable(krennic-debug-tools ./tools/KrennicDebug.cpp)
set_property(TARGET krennic-debug-tools PROPERTY C_STANDARD 17) set_property(TARGET krennic-debug-tools PROPERTY C_STANDARD 17)
set_property(TARGET krennic-debug-tools PROPERTY CXX_STANDARD 17) set_property(TARGET krennic-debug-tools PROPERTY CXX_STANDARD 17)
#set_property(TARGET krennic-debug-tools PROPERTY C_STANDARD_REQUIRED ON)
#set_property(TARGET krennic-debug-tools PROPERTY CXX_STANDARD_REQUIRED ON)
set_target_properties(krennic-debug-tools PROPERTIES OUTPUT_NAME "Krennic-debug") set_target_properties(krennic-debug-tools PROPERTIES OUTPUT_NAME "Krennic-debug")
list(APPEND RDI_TARGETS_LIST krennic-debug-tools) list(APPEND RDI_TARGETS_LIST krennic-debug-tools)

4
src/RDI.cpp
View File

@ -7,6 +7,10 @@
* *
*/ */
#if !(__cplusplus < 201703L) && !(_MSVC_LANG < 201703L)
#error "This code run on C++17 or upper."
#endif
#if defined(RDI_DLL) #if defined(RDI_DLL)
# define RDI_DLLBUILD # define RDI_DLLBUILD
#endif #endif

2
tools/RDIDebug.cpp
View File

@ -7,7 +7,7 @@
* *
*/ */
#if __cplusplus < 201703L #if !(__cplusplus < 201703L) && !(_MSVC_LANG < 201703L)
#error "This code run on C++17 or upper." #error "This code run on C++17 or upper."
#endif #endif