Skip to content
Snippets Groups Projects
Commit ebbdc25a authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Merge pull request #467 from mantidproject/11411_remove_json_cpp_hack 

Remove hack from FindJsonCPP.cmake
parents fde09415 944f61b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Code/Mantid/Build/CMake/FindJsonCPP.cmake
+ 0
− 5
View file @ ebbdc25a
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
# JSONCPP_LIBRARY_DEBUG - library files for linking (debug version) # JSONCPP_LIBRARY_DEBUG - library files for linking (debug version)
# JSONCPP_LIBRARIES - All required libraries, including the configuration type # JSONCPP_LIBRARIES - All required libraries, including the configuration type
# Using unset here is a temporary hack to force FindJson to find the correct
# path in an incremental build. It should be removed a day or two after the
# branch introducing this is merged.
unset ( JSONCPP_INCLUDE_DIR CACHE )
# Headers # Headers
find_path ( JSONCPP_INCLUDE_DIR json/reader.h find_path ( JSONCPP_INCLUDE_DIR json/reader.h
PATH_SUFFIXES jsoncpp ) PATH_SUFFIXES jsoncpp )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment