josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Fixup 428d510f76. Use check_cxx_source_compiles instead of try_compile

Browse Source
This commit is contained in:
DDuarte
2014-10-30 01:57:54 +00:00
parent 6156a541f5
commit 386b97c485
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/macros/ConfigureBoost.cmake
+16 -7
View File
@@ -30,13 +30,22 @@ add_definitions(-DBOOST_DATE_TIME_NO_LIB)
add_definitions(-DBOOST_REGEX_NO_LIB) add_definitions(-DBOOST_REGEX_NO_LIB)
add_definitions(-DBOOST_CHRONO_NO_LIB) add_definitions(-DBOOST_CHRONO_NO_LIB)
try_compile (boost_filesystem_copy_links_without_NO_SCOPED_ENUM # Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
${CMAKE_BINARY_DIR}/try_compile/boost_filesystem_copy_links_without_NO_SCOPED_ENUM
SOURCES ${CMAKE_SOURCE_DIR}/cmake/test_use_boost_cxx11_no_scoped_enum_for_filesystem.cpp include (CheckCXXSourceCompiles)
COMPILE_DEFINITIONS -I${Boost_INCLUDE_DIR}
--std=c++11 set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR})
LINK_LIBRARIES ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} set(CMAKE_REQUIRED_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
) set(CMAKE_REQUIRED_FLAGS "-std=c++11")
unset(boost_filesystem_copy_links_without_NO_SCOPED_ENUM CACHE)
check_cxx_source_compiles("
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
int main() { boost::filesystem::copy_file(boost::filesystem::path(), boost::filesystem::path()); }"
boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
unset(CMAKE_REQUIRED_INCLUDES CACHE)
unset(CMAKE_REQUIRED_LIBRARIES CACHE)
unset(CMAKE_REQUIRED_FLAGS CACHE)
if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM) if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS) add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS)
cmake/test_use_boost_cxx11_no_scoped_enum_for_filesystem.cpp
-25
View File
@@ -1,25 +0,0 @@
/*
* Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
int main()
{
boost::filesystem::copy_file(boost::filesystem::path(), boost::filesystem::path());
return 0;
}