]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
fix xcode builds
authorRuss Combs <rucombs@cisco.com>
Tue, 22 Sep 2015 13:40:45 +0000 (09:40 -0400)
committerRuss Combs <rucombs@cisco.com>
Tue, 22 Sep 2015 13:40:45 +0000 (09:40 -0400)
fix unused warning

cmake/platforms.cmake
extra/CMakeLists.txt
src/lua/lua.cc

index f4ed63a688e872b0dc268232d6499fa9da05cc26..c4e2099b90f6024cab822514d8b1f0fc04781058 100644 (file)
@@ -85,31 +85,31 @@ include(CheckCXXCompilerFlag)
 
 # More MacOS X fun
 set(CMAKE_REQUIRED_FLAGS "-Wl,-undefined,dynamic_lookup")
-check_cxx_compiler_flag("" HAVE_DYNAMIC_LOOKUP)
+check_cxx_compiler_flag(${CMAKE_REQUIRED_FLAGS} HAVE_DYNAMIC_LOOKUP)
 if(HAVE_DYNAMIC_LOOKUP)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,dynamic_lookup")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif()
 unset (CMAKE_REQUIRED_FLAGS)
 
 
 set (CMAKE_REQUIRED_FLAGS "-Wl,-export-dynamic")
-check_cxx_compiler_flag ("" HAVE_EXPORT_DYNAMIC)
+check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_EXPORT_DYNAMIC)
 if (HAVE_EXPORT_DYNAMIC)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-export-dynamic")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif ()
 unset(CMAKE_REQUIRED_FLAGS)
 
 
 set (CMAKE_REQUIRED_FLAGS "-Wl,-shared")
-check_cxx_compiler_flag ("" HAVE_SHARED)
+check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_SHARED)
 if (HAVE_SHARED)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-shared")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif ()
 unset(CMAKE_REQUIRED_FLAGS)
 
 set (CMAKE_REQUIRED_FLAGS "-fvisibility=hidden")
-check_cxx_compiler_flag ("" HAVE_VISIBILITY)
+check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_VISIBILITY)
 if (HAVE_VISIBILITY)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
 endif ()
 unset(CMAKE_REQUIRED_FLAGS)
index 50be64aad32aa1b41e41d5092f03cea17746b49b..54f64636522f3dd8e51d1d87f27889dfdcad30c9 100644 (file)
@@ -46,33 +46,33 @@ else (BUILD_EXTRA_PLUGINS)
 
     include(CheckCXXCompilerFlag)
     set (CMAKE_REQUIRED_FLAGS "-fvisibility=hidden")
-    check_cxx_compiler_flag ("" HAVE_VISIBILITY)
+    check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_VISIBILITY)
     if (HAVE_VISIBILITY)
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_VISIBILITY")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif ()
     unset(CMAKE_REQUIRED_FLAGS)
 
     # Some shared library flags for the two platforms which I am using
     set(CMAKE_REQUIRED_FLAGS "-Wl,-undefined,dynamic_lookup")
-    check_cxx_compiler_flag("" HAVE_DYNAMIC_LOOKUP)
+    check_cxx_compiler_flag(${CMAKE_REQUIRED_FLAGS} HAVE_DYNAMIC_LOOKUP)
     if(HAVE_DYNAMIC_LOOKUP)
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,dynamic_lookup")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif()
     unset (CMAKE_REQUIRED_FLAGS)
 
 
     set (CMAKE_REQUIRED_FLAGS "-Wl,-export-dynamic")
-    check_cxx_compiler_flag ("" HAVE_EXPORT_DYNAMIC)
+    check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_EXPORT_DYNAMIC)
     if (HAVE_EXPORT_DYNAMIC)
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-export-dynamic")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif ()
     unset(CMAKE_REQUIRED_FLAGS)
 
 
     set (CMAKE_REQUIRED_FLAGS "-Wl,-shared")
-    check_cxx_compiler_flag ("" HAVE_SHARED)
+    check_cxx_compiler_flag (${CMAKE_REQUIRED_FLAGS} HAVE_SHARED)
     if (HAVE_SHARED)
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-shared")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_REQUIRED_FLAGS}")
     endif ()
     unset(CMAKE_REQUIRED_FLAGS)
 
index 0e034abb11abf43465936a7b5982ebec982fc88c..fbcc2259c615575e7da421a754378962cfce2a94 100644 (file)
@@ -48,11 +48,9 @@ ManageStack::ManageStack(lua_State* L, int extra) :
     state ( L )
 {
     top = lua_gettop(state);
+
     if ( extra > 0 )
-    {
-        bool result = lua_checkstack(state, extra);
-        assert(result);
-    }
+        assert(lua_checkstack(state, extra));
 }
 
 ManageStack::~ManageStack()