Move public headers out of the src folder

CMakeLists.txt

@@ -25,11 +25,13 @@ add_library(oink::oink ALIAS oink)
 set_target_properties(oink PROPERTIES VERSION ${oink_VERSION} SOVERSION ${oink_VERSION_MAJOR})
 
 set(OINK_HDRS
-    src/oink.hpp
-    src/error.hpp
-    src/game.hpp
-    src/bitset.hpp
-    src/uintqueue.hpp
+    include/oink/oink.hpp
+    include/oink/error.hpp
+    include/oink/game.hpp
+    include/oink/solvers.hpp
+    include/oink/bitset.hpp
+    include/oink/uintqueue.hpp
+    include/oink/libpopcnt.h
 )
 
 target_compile_features(oink PUBLIC c_std_11 cxx_std_11)
@@ -47,8 +49,9 @@ target_include_directories(oink
     ${CMAKE_CURRENT_LIST_DIR}/src
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
-    $<INSTALL_INTERFACE:include/oink>
+    $<INSTALL_INTERFACE:include>
 )
 
 target_link_libraries(oink pthread lace::lace)

src/bitset.hpp → include/oink/bitset.hpp

@@ -17,7 +17,7 @@
 #ifndef BITSET_HPP
 #define BITSET_HPP
 
-#include <libpopcnt.h>
+#include <oink/libpopcnt.h>
 
 namespace pg
 {

src/game.hpp → include/oink/game.hpp

@@ -24,7 +24,7 @@
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int_distribution.hpp>
 
-#include <bitset.hpp>
+#include <oink/bitset.hpp>
 
 namespace pg {
 

src/oink.hpp → include/oink/oink.hpp

@@ -20,9 +20,9 @@
 #include <iostream>
 #include <vector>
 
-#include "error.hpp"
-#include "game.hpp"
-#include "uintqueue.hpp"
+#include "oink/error.hpp"
+#include "oink/game.hpp"
+#include "oink/uintqueue.hpp"
 
 namespace pg {
 

src/dtl.hpp

@@ -17,7 +17,6 @@
 #ifndef DTL_HPP
 #define DTL_HPP
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {

src/fpi.cpp

@@ -19,7 +19,6 @@
 #include <unistd.h>
 
 #include "fpi.hpp"
-#include "uintqueue.hpp"
 
 namespace pg {
 

src/fpj.cpp

@@ -20,7 +20,6 @@
 #include <stack>
 
 #include "fpj.hpp"
-#include "uintqueue.hpp"
 
 namespace pg {
 

src/game.cpp

@@ -20,7 +20,7 @@
 #include <iostream>
 #include <ctime>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 #define USE_MMAP 1
 

src/mspm.hpp

@@ -19,7 +19,6 @@
 
 #include <queue>
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {

src/npp.hpp

@@ -21,9 +21,7 @@
 #include <deque>
 #include <vector>
 
-#include "oink.hpp"
 #include "solver.hpp"
-#include "uintqueue.hpp"
 
 namespace pg
 {

src/oink.cpp

@@ -22,8 +22,8 @@
 #include <iostream>
 #include <chrono>
 
-#include "oink.hpp"
-#include "solvers.hpp"
+#include "oink/oink.hpp"
+#include "oink/solvers.hpp"
 #include "solver.hpp"
 #include "lace.h"
 

src/pp.hpp

@@ -19,7 +19,6 @@
 
 #include <queue>
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {

src/ptl.hpp

@@ -17,7 +17,6 @@
 #ifndef PTL_HPP
 #define PTL_HPP
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {

src/qpt.hpp

@@ -18,7 +18,6 @@
 #define QPT_HPP
 
 #include "solver.hpp"
-#include "uintqueue.hpp"
 
 namespace pg {
 

src/rtl.hpp

@@ -22,9 +22,7 @@
 #include <map>
 #include <tuple>
 
-#include "oink.hpp"
 #include "solver.hpp"
-#include "npp.hpp"
 
 namespace pg {
 

src/scc.cpp

@@ -19,7 +19,7 @@
 #include <deque>
 #include <stack>
 #include <cstring> // for memset
-#include "oink.hpp"
+#include "oink/oink.hpp"
 
 namespace pg {
 

src/solver.hpp

@@ -17,9 +17,9 @@
 #ifndef SOLVER_HPP
 #define SOLVER_HPP
 
-#include "game.hpp"
-#include "oink.hpp"
-#include "error.hpp"
+#include "oink/game.hpp"
+#include "oink/oink.hpp"
+#include "oink/error.hpp"
 
 namespace pg {
 

src/solvers.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "solvers.hpp"
+#include "oink/solvers.hpp"
 
 #include "zlk.hpp"
 #include "pp.hpp"

src/spm.hpp

@@ -19,7 +19,6 @@
 
 #include <queue>
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {

src/sspm.hpp

@@ -17,9 +17,7 @@
 #ifndef SSPM_HPP
 #define SSPM_HPP
 
-#include "oink.hpp"
 #include "solver.hpp"
-#include "uintqueue.hpp"
 
 namespace pg {
 

src/tl.hpp

@@ -17,7 +17,6 @@
 #ifndef TL_HPP
 #define TL_HPP
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {

src/tools/counter_core.cpp

@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/counter_dp.cpp

@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/counter_m.cpp

@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/counter_ortl.cpp

@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/counter_rob.cpp

@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/counter_rr.cpp

@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/counter_symsi.cpp

@@ -17,7 +17,7 @@
 #include <iostream>
 #include <memory>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/dotty.cpp

@@ -17,7 +17,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace pg;
 

src/tools/nudge.cpp

@@ -20,7 +20,7 @@
 #include <random>
 
 #include "cxxopts.hpp"
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace std;
 using namespace pg;

src/tools/simple.cpp

@@ -16,7 +16,7 @@
 
 #include <fstream>
 
-#include "oink.hpp"
+#include "oink/oink.hpp"
 
 int
 main(int argc, char** argv)

src/tools/solve.cpp

@@ -27,9 +27,8 @@
 #include <boost/iostreams/filter/gzip.hpp>
 
 #include "cxxopts.hpp" 
-#include "game.hpp"
-#include "oink.hpp"
-#include "solvers.hpp"
+#include "oink/oink.hpp"
+#include "oink/solvers.hpp"
 #include "verifier.hpp"
 #include "tools/getrss.h"
 

src/tools/stgame.cpp

@@ -19,7 +19,7 @@
 #include <random>
 #include <cstring>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace std;
 

src/tools/tc+.cpp

@@ -17,7 +17,7 @@
 #include <iostream>
 #include <memory>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 using namespace std;
 using namespace pg;

src/tools/tc.cpp

@@ -17,7 +17,7 @@
 #include <iostream>
 #include <memory>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 
 #define DOUBLEDISTRACTION 0
 

src/tools/verify.cpp

@@ -18,7 +18,7 @@
 #include <fstream>
 #include <sys/time.h>
 
-#include "game.hpp"
+#include "oink/game.hpp"
 #include "verifier.hpp"
 
 using namespace std;

src/tspm.hpp

@@ -19,7 +19,6 @@
 
 #include <queue>
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {

src/verifier.cpp

@@ -24,7 +24,6 @@
 #include <deque>
 #include <stack>
 
-#include "game.hpp"
 #include "verifier.hpp"
 
 using namespace std;

src/verifier.hpp

@@ -18,7 +18,7 @@
 #define VERIFIER_HPP
 
 #include <istream>
-#include "game.hpp"
+#include "oink/game.hpp"
 
 namespace pg {
 

src/zlk.hpp

@@ -20,8 +20,6 @@
 #include <queue>
 
 #include "solver.hpp"
-#include "lace.h"
-#include "uintqueue.hpp"
 
 namespace pg {
 

src/zlkpp.hpp

@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "oink.hpp"
 #include "solver.hpp"
 
 namespace pg {