]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #712 in SNORT/snort3 from cmake_cpputest to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 18 Nov 2016 18:40:01 +0000 (13:40 -0500)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 18 Nov 2016 18:40:01 +0000 (13:40 -0500)
commit0b8ccc4f46b47de97331208551916a35d24f14cd
treea9df9b0db8da0ee3a726bb9e8881d70ec9b5d33b
parent5cc5fc5aff20040a52fcaef00fc4f1cbf544aec5
Merge pull request #712 in SNORT/snort3 from cmake_cpputest to master

Squashed commit of the following:

commit fb4c001b0b8709a3505bb044705be8a2cedd84d8
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Nov 18 11:50:08 2016 -0500

    cmake: Correct package name used in HS and HWLOC so that REQUIRED works.

commit 3a543585194bf2c30993cca4247bfd7f6ef88027
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Nov 18 11:48:20 2016 -0500

    cmake: Improve detection and use of CppUTest in non-standard locations
CMakeLists.txt
cmake/FindCppUTest.cmake [new file with mode: 0644]
cmake/FindHS.cmake
cmake/FindHWLOC.cmake
cmake/include_libraries.cmake
cmake/macros.cmake