cmake: Take updates from cdk.

Author: rsomla1

cmake/compiler/CLANG.cmake

@@ -1,25 +1,24 @@
-#
-# If Clang is used and deployment target is not specified
-# with MACOSX_DEPLOYMENT_TARGET environment variable, make
-# sure that clang's native implementation of C++ std
-# libarary (libc++) is used. Otherwise clang defaults to
-# GNU version (libstdc++) which is outdated and does
-# not handle C++11 well.
-#
-# TODO: Add option to use the default runtime if user wishes
-# so.
-#
 
-function(set_visibility)
-  add_compile_options(-fvisibility-ms-compat)
-endfunction()
+function(enable_cxx11)
 
-# ???
+  #
+  # If Clang is used and deployment target is not specified
+  # with MACOSX_DEPLOYMENT_TARGET environment variable, make
+  # sure that clang's native implementation of C++ std
+  # libarary (libc++) is used. Otherwise clang defaults to
+  # GNU version (libstdc++) which is outdated and does
+  # not handle C++11 well.
+  #
+  # TODO: Add option to use the default runtime if user wishes
+  # so.
+  #
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang"
-   AND NOT DEFINED ENV{MACOSX_DEPLOYMENT_TARGET}
-   AND NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
+  add_flags(CXX -std=c++11 -stdlib=libc++)
+
+endfunction()
 
-  list(APPEND CPP11FLAGS -stdlib=libc++)
 
-endif()
+function(set_visibility)
+  add_compile_options(-fvisibility-ms-compat)
+endfunction()
+

cmake/compiler/SUNPRO.cmake

@@ -39,7 +39,7 @@ endfunction()
 
 
 function(enable_pic)
-  add_compile_options(CXX -KPIC)
+  add_flags(CXX -KPIC)
 endfunction()
 
 

cmake/libutils.cmake

@@ -150,9 +150,9 @@ function(merge_libraries TARGET)
   #  Note: empty.c is not really needed, but cmake does not accept a library
   #  target with no sources.
 
-  set_property(SOURCE "${LIBUTILS_SCRIPT_DIR}/empty.c" PROPERTY LANGUAGE CXX)
+  set_property(SOURCE "${LIBUTILS_SCRIPT_DIR}/empty.cc" PROPERTY LANGUAGE CXX)
 
-  add_library(${TARGET} ${TYPE} "${LIBUTILS_SCRIPT_DIR}/empty.c")
+  add_library(${TARGET} ${TYPE} "${LIBUTILS_SCRIPT_DIR}/empty.cc")
   target_link_libraries(${TARGET} PRIVATE ${ARGN})
 
   #