diff options
| author | Alec Thomas <alec@swapoff.org> | 2015-12-21 16:53:07 +1100 |
|---|---|---|
| committer | Alec Thomas <alec@swapoff.org> | 2015-12-21 16:53:07 +1100 |
| commit | 604f3e50346945235e39a3d20522412c102a9b8e (patch) | |
| tree | d78ec985c0da73f54e40aa6fd7cb53e491cb4836 | |
| parent | 2d4799809f3571681f9d7aa238ad866f22c5f071 (diff) | |
| parent | d33780cf9f99760e16e26ea4d214fe724a5bab3a (diff) | |
Merge pull request #118 from PHEN-/pr-sharedfix
Fix CMP0054 warnings in CMake >= 3.1
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 08b4c37..fe1fea4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,13 +25,13 @@ include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) include(CheckCXXSourceCompiles) # Default compiler args -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)") +if (CMAKE_CXX_COMPILER_ID MATCHES "(GNU|.*Clang)") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Werror -Wall -Wextra -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=sign-compare -std=c++11") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") set(CMAKE_CXX_FLAGS_MINSIZEREL "-g -Os -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-g -O2 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") -elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +elseif(CMAKE_CXX_COMPILER_ID STREQUAL 'MSVC') # /Zi - Produces a program database (PDB) that contains type information and symbolic debugging information for use with the debugger. # /FS - Allows multiple cl.exe processes to write to the same .pdb file # /DEBUG - Enable debug during linking @@ -42,7 +42,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /Zi /FS /DEBUG") endif() -# if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +# if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-shadow -Wno-padded -Wno-missing-noreturn -Wno-global-constructors") # endif() @@ -56,7 +56,7 @@ set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) include(CheckCXX11Features.cmake) set(OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +if ((MAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() check_cxx_source_compiles( @@ -132,7 +132,6 @@ if (ENTITYX_BUILD_SHARED) ) set_target_properties(entityx_shared PROPERTIES OUTPUT_NAME entityx - DEBUG_POSTFIX -d VERSION ${ENTITYX_VERSION} SOVERSION ${ENTITYX_MAJOR_VERSION}) list(APPEND install_libs entityx_shared) |