Knutel/peter d cmake include fixes

helios/pipeViewer/transactiondb/CMakeLists.txt

@@ -16,7 +16,7 @@ set(TRANSACTIONDB_SRC_DIR ${PROJECT_SOURCE_DIR}/src)
 ##################################################################
 # FIXME use consistent cmake recipe for python extensions here and in ..
 add_custom_command(OUTPUT transactiondb.sh
-  COMMAND printf 'SYSINCDIRS="$ENV{SYSINCDIRS}"
+  COMMAND printf 'SYSINCDIRS="${YAML_CPP_INCLUDE_DIR}"
   PY_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}/src"
   SPARTA_BASE="${SPARTA_BASE}"
   TARGETDIR="lib"

sparta/CMakeLists.txt

@@ -10,23 +10,6 @@ set (GEN_DEBUG_INFO ON CACHE BOOL "Genearate debug info in compile & link -g")
 set (SPARTA_BASE ${CMAKE_CURRENT_SOURCE_DIR})
 include (${SPARTA_BASE}/cmake/sparta-config.cmake)
 
-# Add RapidJSON
-include_directories (SYSTEM ${RAPIDJSON_INCLUDE_DIRS})
-
-# Add YAML CPP
-include_directories (SYSTEM ${YAML_CPP_INCLUDE_DIR})
-
-# Add local includes
-include_directories ("./")
-include_directories ("simdb/include")
-
-# Add Boost (not typical system install)
-include_directories (SYSTEM ${Boost_INCLUDE_DIRS})
-
-# Add HDF5 (not typical system install)
-include_directories (SYSTEM ${HDF5_C_INCLUDE_DIRS})
-include_directories (SYSTEM ${HDF5_INCLUDE_DIRS})
-
 # Add the source for libsparta.a
 list (APPEND SourceCppFiles
             src/ArgosOutputter.cpp
@@ -105,6 +88,12 @@ if (COMPILE_WITH_PYTHON)
     python/sparta_support/Completer.cpp)
 endif ()
 
+add_library (sparta ${SourceCppFiles})
+
+# Add local includes
+target_include_directories (sparta PRIVATE "./")
+target_include_directories (sparta PRIVATE "simdb/include")
+
 execute_process (COMMAND bash "-c" "git describe --tags --always"
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE GIT_REPO_VERSION RESULT_VARIABLE rc
@@ -221,7 +210,6 @@ set (CPPCHECK_EXCLUDES
 )
 find_package (Cppcheck)
 
-add_library (sparta ${SourceCppFiles})
 set (SPARTA_STATIC_LIBS ${PROJECT_BINARY_DIR}/libsparta.a)
 
 # Build the SimDB library
@@ -233,7 +221,6 @@ add_subdirectory (simdb)
 add_subdirectory (test EXCLUDE_FROM_ALL)
 add_subdirectory (example EXCLUDE_FROM_ALL)
 
-
 #
 # Installation
 #

sparta/cmake/sparta-config.cmake

@@ -25,13 +25,6 @@ if (Sparta_VERBOSE)
     set (CMAKE_FIND_DEBUG_MODE ON) # verbosity for find_package
 endif()
 
-set (Boost_USE_STATIC_LIBS OFF)
-
-# BOOST_CMAKE logic for in versions before 1.72 to ask for the shared libraries is broken, you can only force it to use
-# them if you're building shared libs?  wtf?
-set (existing_build_shared ${BUILD_SHARED_LIBS})
-set (BUILD_SHARED_LIBS ON)
-
 execute_process (COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE CXX_VERSION_STRING RESULT_VARIABLE rc)
 if (NOT rc EQUAL "0")
     message (FATAL_ERROR "could not run compiler command '${CMAKE_CXX_COMPILER} --version', rc=${rc}")
@@ -45,39 +38,37 @@ else ()
     set (USING_CONDA OFF)
 endif ()
 
-
-if (APPLE AND NOT USING_CONDA)
-  set (Boost_NO_BOOST_CMAKE ON)
-  set (CMAKE_CXX_COMPILER_VERSION 10.0)
-  find_package (Boost 1.65.0 REQUIRED HINTS /usr/local/Cellar/boost/* COMPONENTS ${_BOOST_COMPONENTS})
-else ()
-  find_package (Boost 1.65.0 REQUIRED COMPONENTS ${_BOOST_COMPONENTS})
-endif ()
-
-set (BUILD_SHARED_LIBS ${existing_build_shared})
+# Find Boost
+set (Boost_USE_STATIC_LIBS OFF)
+find_package (Boost 1.76.0 REQUIRED COMPONENTS ${_BOOST_COMPONENTS})
 message (STATUS "Using BOOST ${Boost_VERSION_STRING}")
+include_directories (SYSTEM ${Boost_INCLUDE_DIRS})
 
 # Find YAML CPP
 find_package (yaml-cpp 0.6 REQUIRED)
 message (STATUS "Using YAML CPP ${yaml-cpp_VERSION}")
 get_property(YAML_CPP_INCLUDE_DIR TARGET yaml-cpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+include_directories (SYSTEM ${YAML_CPP_INCLUDE_DIR})
 
 # Find RapidJSON
 find_package (RapidJSON 1.1 REQUIRED)
+include_directories (SYSTEM ${RapidJSON_INCLUDE_DIRS})
 message (STATUS "Using RapidJSON CPP ${RapidJSON_VERSION}")
 
 # Find SQLite3
 find_package (SQLite3 3.19 REQUIRED)
+include_directories (SYSTEM ${SQLite3_INCLUDE_DIRS})
 message (STATUS "Using SQLite3 ${SQLite3_VERSION}")
 
 # Find zlib
 find_package(ZLIB REQUIRED)
-message (STATUS "Using zlib ${ZLIB_VERSION_STRING}")
 include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
+message (STATUS "Using zlib ${ZLIB_VERSION_STRING}")
 
 # Find HDF5. Need to enable C language for HDF5 testing
 enable_language (C)
 find_package (HDF5 1.10 REQUIRED)
+include_directories (SYSTEM ${HDF5_INCLUDE_DIRS})
 
 # Populate the Sparta_LIBS variable with the required libraries for
 # basic Sparta linking

sparta/simdb/CMakeLists.txt

@@ -6,18 +6,19 @@ include_directories(${SIMDB_BASE}/include)
 include(${SIMDB_BASE}/cmake/simdb-config.cmake)
 
 list(APPEND SimDB_CPP
-            src/HDF5Connection.cpp
-            src/ObjectManager.cpp
-            src/ObjectRef.cpp
-            src/SQLiteConnection.cpp
-            src/TableRef.cpp
-            src/simdb.cpp)
+  src/HDF5Connection.cpp
+  src/ObjectManager.cpp
+  src/ObjectRef.cpp
+  src/SQLiteConnection.cpp
+  src/TableRef.cpp
+  src/simdb.cpp)
 
 add_library(simdb ${SimDB_CPP})
+
 add_subdirectory(test EXCLUDE_FROM_ALL)
 
 install(TARGETS simdb
-        LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib
-	)
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+  )
 install(DIRECTORY include/ DESTINATION include)