Merge branch 'master' into bugs

dcwhite · dcwhite · commit 9bd0adf613c2 · 2016-05-19T17:01:46.000-06:00
diff --git a/src/Core/DatabaseManager/CMakeLists.txt b/src/Core/DatabaseManager/CMakeLists.txt
@@ -42,7 +42,7 @@ SCIRUN_ADD_LIBRARY(Core_DatabaseManager
 )
             
 TARGET_LINK_LIBRARIES(Core_DatabaseManager
-                      sqlite
+                      ${SCI_SQLITE_LIBRARY}
                       ${SCI_BOOST_LIBRARY})
 					  
 IF(BUILD_SHARED_LIBS)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ SCIRUN_ADD_LIBRARY(Core_DatabaseManager`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`TARGET_LINK_LIBRARIES(Core_DatabaseManager`
`45`		`- sqlite`
	`45`	`+ ${SCI_SQLITE_LIBRARY}`
`46`	`46`	`${SCI_BOOST_LIBRARY})`
`47`	`47`
`48`	`48`	`IF(BUILD_SHARED_LIBS)`