Skip to content

Commit

Permalink
Merge pull request #18 from SeadexGmbH/yasmine-1.3.1
Browse files Browse the repository at this point in the history 
yasmine 1.3.1
  • Loading branch information
@SeadexTM
SeadexTM authored Aug 14, 2017
2 parents 71fcea5 + 8198929 commit e1966ff
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 13 deletions.
4 changes: 3 additions & 1 deletion examples/classic_farmroad/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
Expand Down
4 changes: 3 additions & 1 deletion examples/event_collector_example/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
Expand Down
4 changes: 3 additions & 1 deletion examples/events_with_parameters/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
Expand Down
4 changes: 3 additions & 1 deletion examples/forty_two/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
Expand Down
8 changes: 6 additions & 2 deletions examples/generator_example/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ
elseif( "${CMAKE_CXX_FLAGS}" STREQUAL "-m32" )
set(extra_flags "${extra_flags} -m32")
message(STATUS "setting platform x86")
endif()
endif()

set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
if("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
set(Y_OPTIMIZE "SPEED" CACHE STRING "Sets the optimize type. Supported values: SPEED and SIZE. Default value is SPEED.")
Expand Down
4 changes: 3 additions & 1 deletion examples/hello_yasmine/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
Expand Down
4 changes: 3 additions & 1 deletion examples/substatemachines_and_variables/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
Expand Down
4 changes: 3 additions & 1 deletion examples/unhandled_event_handler_example/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# yasmine's preprocessor definitions
Expand Down
4 changes: 3 additions & 1 deletion genesis/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

# genesis's preprocessor definitions
Expand Down
4 changes: 3 additions & 1 deletion libygen/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

endif()
Expand Down
9 changes: 9 additions & 0 deletions version.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
Versions

� yasmine 1.3.1 released 2017-08-14
� libyasmine 1.2.1
� essentials 1.3.1
� hermes 1.1.1
� genesis 0.3.1
� yasmine_model 0.2.1
� libygen 0.2.1
� ygen 0.2.1


� yasmine 1.3.0 released 2017-06-26
� libyasmine 1.2.0
Expand Down
4 changes: 3 additions & 1 deletion yasmine_model/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

endif()
Expand Down
4 changes: 3 additions & 1 deletion ygen/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ

if("${CPP_VERSION}" STREQUAL "03")
set(extra_flags "${extra_flags} -std=c++03 -Wall -Wpedantic -g -Wno-unknown-pragmas -D \"SX_CPP03_BOOST\" -D \"SX_NO_VARIADIC_MACRO\"")
else()
elseif("${CPP_VERSION}" STREQUAL "14")
set(extra_flags "${extra_flags} -std=c++14 -Wall -Wpedantic -g")
else()
set(extra_flags "${extra_flags} -std=c++11 -Wall -Wpedantic -g -D \"SX_NO_STD_MAKE_UNIQUE\"")
endif()

elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
Expand Down

0 comments on commit e1966ff

Please sign in to comment.