From fe1f6682ef162fb940c4c6b973e1fe9a273296bd Mon Sep 17 00:00:00 2001
From: Mate Soos <soos.mate@gmail.com>
Date: Tue, 7 Jul 2020 01:43:43 +0200
Subject: [PATCH] Fixing installation of header files

---
 CMakeLists.txt       |  6 +++---
 src/CMakeLists.txt   | 17 ++++++++---------
 tests/CMakeLists.txt |  3 +--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7126cd3..c610e25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,9 +22,6 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 11)
 
-include (GenerateExportHeader)
-include (GNUInstallDirs)
-
 message(STATUS "LIB directory is '${CMAKE_INSTALL_LIBDIR}'")
 message(STATUS "BIN directory is '${CMAKE_INSTALL_BINDIR}'")
 
@@ -86,6 +83,9 @@ endforeach()
 
 PROJECT(approxmc)
 
+include (GenerateExportHeader)
+include (GNUInstallDirs)
+
 # contains some library search cmake scripts
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b816c26..f2cbbab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -79,14 +79,6 @@ set_target_properties(approxmc PROPERTIES
     SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
 )
 
-install(TARGETS approxmc
-    EXPORT ${CRYPTOMINISAT5_EXPORT_NAME}
-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-    PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/approxmc"
-)
-
 approxmc_add_public_header(approxmc ${CMAKE_CURRENT_BINARY_DIR}/approxmc/approxmc.h )
 
 
@@ -107,6 +99,14 @@ foreach(public_header ${approxmc_public_headers})
     )
 endforeach()
 
+install(TARGETS approxmc
+    EXPORT ${CRYPTOMINISAT5_EXPORT_NAME}
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/approxmc"
+)
+
 add_executable(approxmc-bin
     main.cpp
     ${approxmc_lib_files}
@@ -116,7 +116,6 @@ set(approxmc_exec_link_libs
     ${Boost_LIBRARIES}
     ${GMP_LIBRARY}
     ${CRYPTOMINISAT5_LIBRARIES}
-    ${cms_libs}
 )
 
 IF (ZLIB_FOUND)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 28068dd..bf0fdc4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -74,9 +74,8 @@ foreach(F ${MY_TESTS})
     )
     target_link_libraries(${F}
         ${GMP_LIBRARY}
-        ${CRYPTOMINISAT5_LIBRARIES}
-        ${cms_libs}
         ${GTEST_BOTH_LIBRARIES}
+        ${CRYPTOMINISAT5_LIBRARIES}
         approxmc
     )
     add_test (