set (NLOPT_SUFFIX _cxx)\r
endif ()\r
\r
-if (WITH_CXX OR BUILD_PYTHON)\r
+if (WITH_CXX OR BUILD_PYTHON OR BUILD_GUILE OR BUILD_OCTAVE)\r
enable_language (CXX)\r
endif ()\r
\r
include (CheckFunctionExists)\r
include (CheckTypeSize)\r
include (CheckCCompilerFlag)\r
+include (CheckCXXSymbolExists)\r
+include (CheckCXXCompilerFlag)\r
\r
#==============================================================================\r
# COMPILATION CHECKINGS and CONFIGURATION GENERATION\r
endforeach()\r
endif ()\r
\r
+if (WITH_CXX OR BUILD_PYTHON OR BUILD_GUILE OR BUILD_OCTAVE)\r
+ check_cxx_symbol_exists (_LIBCPP_VERSION string SYSTEM_HAS_LIBCPP)\r
+ if (SYSTEM_HAS_LIBCPP)\r
+ check_cxx_compiler_flag ("-std=c++11" SUPPORTS_STDCXX11)\r
+ if (SUPPORTS_STDCXX11)\r
+ set (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")\r
+ endif ()\r
+ endif ()\r
+endif ()\r
+\r
#==============================================================================\r
# version\r
#==============================================================================\r
message (STATUS "NLopt version ${NLOPT_VERSION_STRING}")\r
\r
#==============================================================================\r
-# CREATE config.h\r
+# CREATE nlopt_config.h\r
#==============================================================================\r
\r
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h IMMEDIATE)\r
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/nlopt_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/nlopt_config.h IMMEDIATE)\r
\r
# pkgconfig file\r
if (UNIX OR MINGW)\r
find_package (NumPy)\r
endif ()\r
\r
-if (PYTHONINTERP_FOUND)\r
+if (NOT DEFINED INSTALL_PYTHON_DIR AND PYTHONINTERP_FOUND)\r
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}'))"\r
OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH\r
OUTPUT_STRIP_TRAILING_WHITESPACE )\r
get_filename_component (_ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE)\r
file (RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})\r
\r
- set (PYTHON_MODULE_PATH ${_REL_PYTHON_MODULE_PATH})\r
+ set (INSTALL_PYTHON_DIR ${_REL_PYTHON_MODULE_PATH})\r
\r
endif ()\r
\r