More fixes to build files

Author: snape

CMakeLists.txt

@@ -56,11 +56,7 @@ option(ENABLE_CMAKE_EXPERIMENTAL_FEATURES
 
 include(CTest)
 
-if(WIN32)
-  set(BUILD_SHARED_LIBS OFF)
-else()
-  option(BUILD_SHARED_LIBS "Build all libraries as shared" ON)
-endif()
+option(BUILD_SHARED_LIBS "Build all libraries as shared" OFF)
 
 include(GNUInstallDirs)
 
@@ -72,9 +68,8 @@ set(AVO_LIBRARY AVO)
 set(AVO_NAME "AVO2 Library")
 
 set(CMAKE_CXX_STANDARD 98)
-set(CMAKE_CXX_STANDARD_REQUIRED OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_EXTENSIONS_REQUIRED OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 option(BUILD_DOCUMENTATION "Build documentation" OFF)
@@ -139,8 +134,14 @@ if(ENABLE_HARDENING)
   else()
     if(APPLE)
       set(AVO_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-      set(CMAKE_REQUIRED_FLAGS
-        "${CMAKE_REQUIRED_FLAGS} -Werror=unused-command-line-argument")
+
+      check_cxx_compiler_flag(-Werror=unused-command-line-argument
+        AVO_COMPILER_SUPPORTS_WERROR_UNUSED_COMMAND_LINE_ARGUMENT)
+
+      if(AVO_COMPILER_SUPPORTS_WERROR_UNUSED_COMMAND_LINE_ARGUMENT)
+        set(CMAKE_REQUIRED_FLAGS
+          "${CMAKE_REQUIRED_FLAGS} -Werror=unused-command-line-argument")
+      endif()
     endif()
 
     check_cxx_compiler_flag(-D_FORTIFY_SOURCE=2
@@ -163,7 +164,7 @@ if(ENABLE_HARDENING)
     endif()
 
     if(AVO_COMPILER_SUPPORTS_D_FORTIFY_SOURCE_2)
-      add_compile_options(-D_FORTIFY_SOURCE=2)
+      add_compile_options($<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>)
     endif()
     if(AVO_COMPILER_SUPPORTS_FCF_PROTECTION)
       add_compile_options(-fcf-protection)
@@ -193,12 +194,12 @@ if(ENABLE_HARDENING)
     check_linker_flag(CXX -Wl,-z,separate-code AVO_LINKER_SUPPORTS_Z_SEPARATE_CODE)
 
     if(AVO_LINKER_SUPPORTS_BSYMBOLIC_FUNCTIONS)
-      add_link_options(-Wl,-Bsymbolic-functions)
+      add_link_options($<$<NOT:$<CONFIG:Debug>>:-Wl,-Bsymbolic-functions>)
     endif()
     if(AVO_COMPILER_SUPPORTS_FSANITIZE_SAFE_STACK
         AND AVO_LINKER_SUPPORTS_FSANITIZE_SAFE_STACK)
-      add_compile_options(-fsanitize=safe-stack)
-      add_link_options(-fsanitize=safe-stack)
+      add_compile_options($<$<NOT:$<CONFIG:Debug>>:-fsanitize=safe-stack>)
+      add_link_options($<$<NOT:$<CONFIG:Debug>>:-fsanitize=safe-stack>)
     endif()
     if(AVO_LINKER_SUPPORTS_Z_DEFS)
       add_link_options(-Wl,-z,defs)

examples/CMakeLists.txt

@@ -52,6 +52,9 @@ if(BUILD_EXAMPLES)
     set(AVO_EXAMPLES_INTERPROCEDURAL_OPTIMIZATION OFF)
   endif()
 
+  include(CheckPIESupported)
+  check_pie_supported()
+
   add_executable(Circle Circle.cc)
   target_compile_definitions(Circle PRIVATE ${AVO_EXAMPLES_COMPILE_DEFINITIONS})
   target_link_libraries(Circle PRIVATE ${AVO_LIBRARY})

src/BUILD.bazel

@@ -120,7 +120,6 @@ cc_library(
     srcs = [
         "Agent.cc",
         "Agent.h",
-        "Export.cc",
         "KdTree.cc",
         "KdTree.h",
         "Line.cc",

src/CMakeLists.txt

@@ -56,7 +56,6 @@ target_sources(${AVO_LIBRARY}
     PRIVATE
       Agent.cc
       Agent.h
-      Export.cc
       KdTree.cc
       KdTree.h
       Line.cc