summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt10
1 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8307191a3f..c2f7134de7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,13 +15,9 @@ include(cmake/xcode.cmake)
if(WITH_CXX11ABI)
set(MASON_CXXABI_SUFFIX -cxx11abi)
- if(CMAKE_COMPILER_IS_GNUCXX)
- add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
- endif()
+ add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
else()
- if(CMAKE_COMPILER_IS_GNUCXX)
- add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
- endif()
+ add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
endif()
if(WITH_OSMESA AND WITH_EGL)
@@ -170,7 +166,7 @@ if(COMMAND mbgl_platform_offline)
include(cmake/offline.cmake)
endif()
-if(COMMAND mbgl_platform_node)
+if(WITH_NODEJS AND COMMAND mbgl_platform_node)
include(cmake/node.cmake)
endif()