Skip to content

CMake builtin c++11 flags #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fdabrandao merged 2 commits into from
Mar 4, 2019
Merged

CMake builtin c++11 flags #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5513804
More -ldl cleanup
zhihaoy Feb 28, 2019
3eb164b
Use CMake builtins to setup C++11 requirements
zhihaoy Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ include(init)

project(MP)

# Set the c++11 flag without GNU extensions.
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if (POLICY CMP0042)
# Enable @rpath support on OS X.
cmake_policy(SET CMP0042 NEW)
Expand Down Expand Up @@ -118,26 +123,6 @@ function(check_module name var)
set(${var} TRUE PARENT_SCOPE)
endfunction()

# Enable C++11.
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-std=c++11 HAVE_STD_CPP11_FLAG)
if (HAVE_STD_CPP11_FLAG)
set(MP_CXX11_FLAG -std=c++11)
else ()
check_cxx_compiler_flag(-std=c++0x HAVE_STD_CPP0X_FLAG)
if (HAVE_STD_CPP0X_FLAG)
set(MP_CXX11_FLAG -std=c++0x)
endif ()
endif ()

# Enable C++11 for target.
function (enable_cxx11 target)
if (MP_CXX11_FLAG)
target_compile_options(${target}
PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${MP_CXX11_FLAG}>)
endif ()
endfunction ()

if (NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
Expand Down Expand Up @@ -207,7 +192,6 @@ function (add_mp_library name)
endif ()
add_library(${name} ${libtype}
${add_mp_library_UNPARSED_ARGUMENTS} ${objects})
enable_cxx11(${name})
target_compile_definitions(${name}
PUBLIC ${add_mp_library_COMPILE_DEFINITIONS})
target_include_directories(${name}
Expand Down Expand Up @@ -254,7 +238,6 @@ add_mp_library(format OBJECT
set(MP_EXPR_INFO_FILE ${MP_SOURCE_DIR}/src/expr-info.cc)
add_executable(gen-expr-info EXCLUDE_FROM_ALL
src/gen-expr-info.cc $<TARGET_OBJECTS:format>)
enable_cxx11(gen-expr-info)
if (MINGW)
SET_TARGET_PROPERTIES(gen-expr-info PROPERTIES
LINK_FLAGS "-static-libgcc -static-libstdc++")
Expand Down
4 changes: 0 additions & 4 deletions src/asl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,6 @@ add_mp_library(asl STATIC OBJECT_LIBRARIES asl-core asl-extra
if (NOT WIN32)
target_link_libraries(asl m)
endif ()
check_library_exists(dl dlopen "" HAVE_LIBDL)
if (HAVE_LIBDL)
target_link_libraries(asl dl)
endif ()

if (BUILD_SHARED_LIBS)
add_library(asl-shared $<TARGET_OBJECTS:asl-core> $<TARGET_OBJECTS:asl-extra>)
Expand Down