diff --git a/CMakeLists.txt b/CMakeLists.txt index 87309bf..23f5063 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) include(CheckCXXSourceCompiles) # Default compiler args +if(0) 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") @@ -41,6 +42,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(CMAKE_CXX_FLAGS_RELEASE "/Ox -DNDEBUG") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /Zi /FS /DEBUG") endif() +endif() # 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") @@ -156,9 +158,9 @@ endif (ENTITYX_BUILD_TESTING) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h.in - ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h + ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h ) - +include_directories(${CMAKE_CURRENT_BINARY_DIR}) if (NOT WINDOWS OR CYGWIN) set(entityx_libs -lentityx) @@ -179,6 +181,7 @@ install( DESTINATION "include" FILES_MATCHING PATTERN "*.h" ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h DESTINATION include/entityx) install( TARGETS ${install_libs}