Fix buil-in JSON dependency.

GXClashPointSystems/CMakeLists.txt

@@ -27,11 +27,6 @@ if( APPLE )
   find_package(OpenGL REQUIRED)
 endif()
 
-# If we use standalone-build of nlohmann_json parser
-if( GEOMODEL_USE_BUILTIN_JSON )
-   add_dependencies( GeoModelJSONParser JSON )
-endif()
-
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
 file( GLOB HEADERS GXClashPointSystems/*.h )
@@ -50,8 +45,14 @@ include_directories ("${PROJECT_SOURCE_DIR}")
 include_directories ("${PROJECT_SOURCE_DIR}/src")
 include_directories ("${PROJECT_SOURCE_DIR}/../VP1HEPVis")
 include_directories ("${PROJECT_SOURCE_DIR}/../VP1Base")
+
 add_library ( GXClashPointSystems SHARED ${SOURCES} ${HEADERS} ${UI_HDRS}  )
 
+# If we use standalone-build of nlohmann_json parser, add explicit dependency
+if( GEOMODEL_USE_BUILTIN_JSON )
+   add_dependencies( GXClashPointSystems JSON )
+endif()
+
 # External dependencies:
 include_directories(${Qt5Core_INCLUDE_DIRS} )
 include_directories(${Qt5Gui_INCLUDE_DIRS} )

VP1GeometrySystems/CMakeLists.txt

@@ -28,10 +28,6 @@ if( APPLE )
   find_package(OpenGL REQUIRED)
 endif()
 
-# If we use standalone-build of nlohmann_json parser
-if( GEOMODEL_USE_BUILTIN_JSON )
-   add_dependencies( GeoModelJSONParser JSON )
-endif()
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
@@ -53,8 +49,14 @@ include_directories ("${PROJECT_SOURCE_DIR}")
 include_directories ("${PROJECT_SOURCE_DIR}/src")
 include_directories ("${PROJECT_SOURCE_DIR}/../VP1HEPVis")
 include_directories ("${PROJECT_SOURCE_DIR}/../VP1Base")
+
 add_library ( GXGeometrySystems SHARED ${SOURCES} ${HEADERS} ${UI_HDRS}  )
 
+# If we use standalone-build of nlohmann_json parser, add explicit dependency
+if( GEOMODEL_USE_BUILTIN_JSON )
+   add_dependencies( GXGeometrySystems JSON )
+endif()
+
 # External dependencies:
 include_directories(${Qt5Core_INCLUDE_DIRS} )
 include_directories(${Qt5Gui_INCLUDE_DIRS} )