diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2016-10-16 08:48:40 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2016-10-16 08:48:40 +0300 |
| commit | 7a33f6f1eb08b93fc545fa175a76ba2378a974e8 (patch) | |
| tree | 32d128dd4978cdb5ac4957ccb2152b8c506ab037 | |
| parent | test: ignore Pylint "invalid name" warnings (diff) | |
| download | aes-tools-7a33f6f1eb08b93fc545fa175a76ba2378a974e8.tar.gz aes-tools-7a33f6f1eb08b93fc545fa175a76ba2378a974e8.zip | |
CMakeLists.txt: code style
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cxx/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 63f1d74..84871c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(aes_tools) if(MSVC) add_compile_options(/MP /W4) -elseif(CMAKE_COMPILER_IS_GNUCC) +elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) add_compile_options(-Wall -Wextra) endif() @@ -15,7 +15,7 @@ function(aes_tools_use_static_runtime target) target_compile_options(${target} PRIVATE $<$<CONFIG:Release>:/MT> $<$<CONFIG:Debug>:/MTd>) - elseif(CMAKE_COMPILER_IS_GNUCC) + elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) get_target_property(type ${target} TYPE) if(type STREQUAL EXECUTABLE) target_link_libraries(${target} PRIVATE @@ -30,7 +30,7 @@ macro(add_executable target) _add_executable(${ARGV}) if(TARGET ${target}) aes_tools_use_static_runtime(${target}) - if(CMAKE_COMPILER_IS_GNUCC) + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) target_link_libraries(${target} PRIVATE $<$<CONFIG:Release>:-s>) endif() endif() @@ -55,7 +55,7 @@ aes_tools_use_static_runtime(libaes) if(MSVC) target_compile_definitions(libaes PRIVATE _CRT_SECURE_NO_WARNINGS) -elseif(CMAKE_COMPILER_IS_GNUCC) +elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) target_compile_options(libaes PUBLIC -mssse3 -maes) endif() diff --git a/cxx/CMakeLists.txt b/cxx/CMakeLists.txt index df73860..9dddb5c 100644 --- a/cxx/CMakeLists.txt +++ b/cxx/CMakeLists.txt @@ -4,6 +4,6 @@ add_library(libaesxx INTERFACE) target_include_directories(libaesxx INTERFACE include/ ${Boost_INCLUDE_DIRS}) target_link_libraries(libaesxx INTERFACE libaes) -if(CMAKE_COMPILER_IS_GNUCXX) +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) target_compile_options(libaesxx INTERFACE -std=c++11) endif() |