Forráskód Böngészése

Merge pull request #283 from joelg236/cmake-inclusion

C++ cmake fixes
bel2125 9 éve
szülő
commit
4521281707
2 módosított fájl, 1 hozzáadás és 3 törlés
  1. 0 2
      CMakeLists.txt
  2. 1 1
      src/CMakeLists.txt

+ 0 - 2
CMakeLists.txt

@@ -314,7 +314,6 @@ if (CIVETWEB_ENABLE_CXX)
   add_cxx_compiler_flag(-Wall)
   add_cxx_compiler_flag(-Wextra)
   add_cxx_compiler_flag(-Wshadow)
-  add_cxx_compiler_flag(-Wsign-conversion)
   add_cxx_compiler_flag(-Wmissing-prototypes)
   add_cxx_compiler_flag(-Weverything)
   add_cxx_compiler_flag(/W4)
@@ -330,7 +329,6 @@ if (CIVETWEB_ENABLE_CXX)
   endif()
   add_cxx_compiler_flag(/WX)
   add_cxx_compiler_flag(-pedantic-errors)
-  add_cxx_compiler_flag(-Wzero-as-null-pointer-constant)
   add_cxx_compiler_flag(-fvisibility=hidden)
   add_cxx_compiler_flag(-fstack-protector-strong RELEASE)
   add_cxx_compiler_flag(-flto RELEASE)

+ 1 - 1
src/CMakeLists.txt

@@ -45,7 +45,7 @@ if (CIVETWEB_ENABLE_SLL AND NOT CIVETWEB_ENABLE_OPENSLL_DYNAMIC_LOADING)
 else()
   find_package(LibDl)
   if (LIBDL_FOUND)
-    target_link_libraries(c-library LIBDL::LIBDL)
+    target_link_libraries(c-library -ldl)
   endif()
 endif()