|
@@ -269,7 +269,7 @@ foreach(library ${LIBRARIES})
|
|
|
target_compile_options(${NAME} PUBLIC "/MP")
|
|
target_compile_options(${NAME} PUBLIC "/MP")
|
|
|
endif(MSVC)
|
|
endif(MSVC)
|
|
|
|
|
|
|
|
- set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
install(TARGETS ${NAME}
|
|
install(TARGETS ${NAME}
|
|
@@ -368,7 +368,7 @@ if(BUILD_PYTHON_BINDINGS)
|
|
|
|
|
|
|
|
set_target_properties(${NAME} PROPERTIES PREFIX "")
|
|
set_target_properties(${NAME} PROPERTIES PREFIX "")
|
|
|
|
|
|
|
|
- set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
install(TARGETS ${NAME}
|
|
install(TARGETS ${NAME}
|
|
@@ -396,7 +396,7 @@ if(BUILD_LUA_BINDINGS)
|
|
|
SOVERSION ${LIBROCKET_VERSION_MAJOR}
|
|
SOVERSION ${LIBROCKET_VERSION_MAJOR}
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
- set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET ${NAME} PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET ${NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
install(TARGETS ${NAME}
|
|
install(TARGETS ${NAME}
|
|
@@ -587,14 +587,14 @@ endif(NOT BUILD_FRAMEWORK)
|
|
|
|
|
|
|
|
# Build and install sample shell library
|
|
# Build and install sample shell library
|
|
|
add_library(shell STATIC ${shell_SRC_FILES} ${shell_HDR_FILES})
|
|
add_library(shell STATIC ${shell_SRC_FILES} ${shell_HDR_FILES})
|
|
|
- set_property(TARGET shell PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET shell PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET shell PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET shell PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
# Build and install the basic samples
|
|
# Build and install the basic samples
|
|
|
foreach(sample ${samples})
|
|
foreach(sample ${samples})
|
|
|
bl_sample(${sample} ${sample_LIBRARIES})
|
|
bl_sample(${sample} ${sample_LIBRARIES})
|
|
|
|
|
|
|
|
- set_property(TARGET ${sample} PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET ${sample} PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET ${sample} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET ${sample} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
# The samples always set this as their current working directory
|
|
# The samples always set this as their current working directory
|
|
@@ -641,7 +641,7 @@ endif(NOT BUILD_FRAMEWORK)
|
|
|
include_directories(${SDL2_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
|
|
include_directories(${SDL2_INCLUDE_DIR} ${GLEW_INCLUDE_DIR})
|
|
|
|
|
|
|
|
bl_sample(sdl2 ${sample_LIBRARIES} ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${GLEW_LIBRARY})
|
|
bl_sample(sdl2 ${sample_LIBRARIES} ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${GLEW_LIBRARY})
|
|
|
- set_property(TARGET sdl2 PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET sdl2 PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET sdl2 PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET sdl2 PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
# The samples always set this as their current working directory
|
|
# The samples always set this as their current working directory
|
|
@@ -700,7 +700,7 @@ endif(NOT BUILD_FRAMEWORK)
|
|
|
bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES})
|
|
bl_sample(sfml2 ${sample_LIBRARIES} ${SFML_LIBRARIES})
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
- set_property(TARGET sfml2 PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET sfml2 PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET sfml2 PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET sfml2 PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
# The samples always set this as their current working directory
|
|
# The samples always set this as their current working directory
|
|
@@ -713,11 +713,8 @@ endif(NOT BUILD_FRAMEWORK)
|
|
|
# Build and install the tutorials
|
|
# Build and install the tutorials
|
|
|
foreach(tutorial ${tutorials})
|
|
foreach(tutorial ${tutorials})
|
|
|
bl_sample(${tutorial} ${sample_LIBRARIES})
|
|
bl_sample(${tutorial} ${sample_LIBRARIES})
|
|
|
-
|
|
|
|
|
- set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD 17)
|
|
|
|
|
- set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
|
|
- set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET ${tutorial} PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
|
|
|
|
|
# The tutorials always set this as their current working directory
|
|
# The tutorials always set this as their current working directory
|
|
@@ -729,7 +726,7 @@ endif(NOT BUILD_FRAMEWORK)
|
|
|
|
|
|
|
|
# Build and install invaders sample
|
|
# Build and install invaders sample
|
|
|
bl_sample(invaders ${sample_LIBRARIES})
|
|
bl_sample(invaders ${sample_LIBRARIES})
|
|
|
- set_property(TARGET invaders PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET invaders PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET invaders PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET invaders PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
install(DIRECTORY DESTINATION ${SAMPLES_DIR}/invaders)
|
|
install(DIRECTORY DESTINATION ${SAMPLES_DIR}/invaders)
|
|
|
install(TARGETS invaders
|
|
install(TARGETS invaders
|
|
@@ -739,7 +736,7 @@ endif(NOT BUILD_FRAMEWORK)
|
|
|
if(BUILD_PYTHON_BINDINGS)
|
|
if(BUILD_PYTHON_BINDINGS)
|
|
|
# Build and install pyinvaders sample
|
|
# Build and install pyinvaders sample
|
|
|
bl_sample(pyinvaders ${sample_LIBRARIES} ${PYTHON_LIBRARIES} ${PY_BINDINGS_LINK_LIBS})
|
|
bl_sample(pyinvaders ${sample_LIBRARIES} ${PYTHON_LIBRARIES} ${PY_BINDINGS_LINK_LIBS})
|
|
|
- set_property(TARGET pyinvaders PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET pyinvaders PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET pyinvaders PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET pyinvaders PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
install(DIRECTORY DESTINATION ${SAMPLES_DIR}/pyinvaders)
|
|
install(DIRECTORY DESTINATION ${SAMPLES_DIR}/pyinvaders)
|
|
|
install(TARGETS pyinvaders
|
|
install(TARGETS pyinvaders
|
|
@@ -749,7 +746,7 @@ endif(NOT BUILD_FRAMEWORK)
|
|
|
|
|
|
|
|
if(BUILD_LUA_BINDINGS)
|
|
if(BUILD_LUA_BINDINGS)
|
|
|
bl_sample(luainvaders RocketCoreLua RocketControlsLua ${sample_LIBRARIES} ${LUA_BINDINGS_LINK_LIBS})
|
|
bl_sample(luainvaders RocketCoreLua RocketControlsLua ${sample_LIBRARIES} ${LUA_BINDINGS_LINK_LIBS})
|
|
|
- set_property(TARGET luainvaders PROPERTY CXX_STANDARD 11)
|
|
|
|
|
|
|
+ set_property(TARGET luainvaders PROPERTY CXX_STANDARD 14)
|
|
|
set_property(TARGET luainvaders PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
set_property(TARGET luainvaders PROPERTY CXX_STANDARD_REQUIRED ON)
|
|
|
install(DIRECTORY DESTINATION ${SAMPLES_DIR}/luainvaders)
|
|
install(DIRECTORY DESTINATION ${SAMPLES_DIR}/luainvaders)
|
|
|
install(TARGETS luainvaders
|
|
install(TARGETS luainvaders
|