Fixed sajson conflict

glycojones · Jun 24, 2024 · d1c758c · d1c758c
1 parent dc50183
commit d1c758c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
  checkout/libccp4/ccp4 
  checkout/clipper 
  checkout/gemmi/include
- dependencies/gemmi
+#  dependencies/gemmi
  checkout/zlib
  ${PRIVATEER_SOURCE_DIR}/cpp
  ${PRIVATEER_SOURCE_DIR}/cpp/pybind11

diff --git a/gemmi/CMakeLists.txt b/gemmi/CMakeLists.txt
@@ -17,15 +17,13 @@ endif()
 include_directories("${gemmi_src}/include"
         "${gemmi_src}/third_party")
 
+
+file(GLOB CPP_FILES ${gemmi_src}/src/*.cpp)
+
 add_library(gemmi_cpp
-            ${gemmi_src}/src/align.cpp ${gemmi_src}/src/assembly.cpp ${gemmi_src}/src/calculate.cpp ${gemmi_src}/src/crd.cpp
-            ${gemmi_src}/src/ddl.cpp ${gemmi_src}/src/eig3.cpp ${gemmi_src}/src/gz.cpp ${gemmi_src}/src/intensit.cpp ${gemmi_src}/src/json.cpp
-            ${gemmi_src}/src/mmcif.cpp ${gemmi_src}/src/mmread_gz.cpp ${gemmi_src}/src/mtz.cpp ${gemmi_src}/src/mtz2cif.cpp
-            ${gemmi_src}/src/polyheur.cpp ${gemmi_src}/src/read_cif.cpp ${gemmi_src}/src/resinfo.cpp
-            ${gemmi_src}/src/riding_h.cpp ${gemmi_src}/src/sprintf.cpp ${gemmi_src}/src/to_mmcif.cpp
-            ${gemmi_src}/src/to_pdb.cpp ${gemmi_src}/src/monlib.cpp ${gemmi_src}/src/topo.cpp ${gemmi_src}/src/xds_ascii.cpp)
-
-#set_target_properties(gemmi_cpp PROPERTIES COMPILE_FLAGS "-fexceptions -pthread -s USE_ZLIB=1 -s USE_PTHREADS=1" )
+            ${CPP_FILES})
+
+#set_target_properties(gemmi_cpp PROPERTIES COMPILE_FLAGS "-fexceptions -pthread -s USE_ZLIB=1 -s USE_PTHREADS=1" ) ${gemmi_src}/src/gz.cpp
 
 file(GLOB HEADER_FILES ${gemmi_src}/include/gemmi/*.hpp)
 

diff --git a/src/privateer/cpp/privateer-json.h b/src/privateer/cpp/privateer-json.h
@@ -11,8 +11,8 @@
 
 #include <iostream>
 #include "privateer-error.h"
-#include "third-party/sajson.h" // Have to include it straight from gemmi, as otherwise it leads to "error: multiple definition of ‘enum sajson::type’" errors.
-// #include "gemmi/third_party/sajson.h"
+// #include "third-party/sajson.h" // Have to include it straight from gemmi, as otherwise it leads to "error: multiple definition of ‘enum sajson::type’" errors.
+#include "gemmi/third_party/sajson.h"
 #include <vector>
 #include <unordered_map>
 #include <cstdio>    // for FILE, fopen, fclose