]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Cmake now changes library when switching ENABLE_STATIC_DAQ between on/off
authorJosh <jrosenba@cisco.com>
Tue, 22 Apr 2014 12:58:36 +0000 (08:58 -0400)
committerJosh <jrosenba@cisco.com>
Tue, 22 Apr 2014 12:58:36 +0000 (08:58 -0400)
cmake/setConfigureOptions.txt

index f34e0b3f838245a61ea9f77a3740eca57e8bec7b..003bccf345bb5f0b54bc48eae39717ccfe6cfd4d 100644 (file)
@@ -122,6 +122,15 @@ if ("${CMAKE_GENERATOR}" MATCHES "Xcode")
 endif()
 
 
-
-#add_definitions(-DHAVE_DAQ_ADDRESS_SPACE_ID)
+# This code resets the DAQ libraries so cmake will now search for the static/shared DAQ library
+if(DEFINED STATIC_DAQ_PRREVIOUSLY_ENABLED)
+    if(NOT (ENABLE-STATIC_DAQ STREQUAL STATIC_DAQ_PRREVIOUSLY_ENABLED))
+        unset(DAQ_FOUND CACHE)
+        unset(DAQ_LIBRARY CACHE)
+        unset(DAQ_LIBRARIES CACHE)
+        set(STATIC_DAQ_PRREVIOUSLY_ENABLED "${ENABLE_STATIC_DAQ}" CACHE INTERNAL "save daq link type" FORCE)
+    endif()
+else()
+    set(STATIC_DAQ_PRREVIOUSLY_ENABLED "${ENABLE_STATIC_DAQ}" CACHE INTERNAL "save daq link type" FORCE)
+endif()